[webkit-changes] cvs commit: JavaScriptCore/kjs string_object.cpp

[Adele]

adele       05/07/14 10:38:07

  Modified:    .        Tag: gcc-4-0-branch ChangeLog
               kjs      Tag: gcc-4-0-branch string_object.cpp
  Log:
          Merged changes from TOT
  
      2005-04-26  Maciej Stachowiak  <mjs at apple.com>
  
          Reviewed by Chris.
  
  	<rdar://problem/4092136> reproducible crash in KJS::kjs_fast_realloc loading maps.google.com
  
  	* kjs/string_object.cpp:
          (StringObjectFuncImp::call): Allocate adopted ustring buffer properly.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.677.8.4 +13 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.8.3
  retrieving revision 1.677.8.4
  diff -u -r1.677.8.3 -r1.677.8.4
  --- ChangeLog	14 Jul 2005 17:33:21 -0000	1.677.8.3
  +++ ChangeLog	14 Jul 2005 17:38:05 -0000	1.677.8.4
  @@ -1,5 +1,18 @@
   2005-07-14  Adele Peterson  <adele at apple.com>
   
  +        Merged changes from TOT
  +
  +    2005-04-26  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Chris.
  +
  +	<rdar://problem/4092136> reproducible crash in KJS::kjs_fast_realloc loading maps.google.com
  +        
  +	* kjs/string_object.cpp:
  +        (StringObjectFuncImp::call): Allocate adopted ustring buffer properly.
  +
  +2005-07-14  Adele Peterson  <adele at apple.com>
  +
           Merged changes from TOT.
   
       2005-04-22  Darin Adler  <darin at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.31.10.3 +1 -1      JavaScriptCore/kjs/string_object.cpp
  
  Index: string_object.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/string_object.cpp,v
  retrieving revision 1.31.10.2
  retrieving revision 1.31.10.3
  diff -u -r1.31.10.2 -r1.31.10.3
  --- string_object.cpp	14 Jul 2005 17:33:23 -0000	1.31.10.2
  +++ string_object.cpp	14 Jul 2005 17:38:06 -0000	1.31.10.3
  @@ -739,7 +739,7 @@
   {
     UString s;
     if (args.size()) {
  -    UChar *buf = new UChar[args.size()];
  +    UChar *buf = static_cast<UChar *>(kjs_fast_malloc(args.size() * sizeof(UChar)));
       UChar *p = buf;
       ListIterator it = args.begin();
       while (it != args.end()) {