[webkit-changes] cvs commit: JavaScriptCore/pcre get.c

[Darin]

darin       05/06/18 23:21:31

  Modified:    .        ChangeLog
               pcre     get.c
  Log:
          Reviewed by Eric Seidel.
  
          * pcre/get.c: (pcre_get_substring): Fix some computations so this works for UTF-16.
          This is unused in the current JavaScriptCore, but still good to fix.
  
  Revision  Changes    Path
  1.714     +7 -0      JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.713
  retrieving revision 1.714
  diff -u -r1.713 -r1.714
  --- ChangeLog	19 Jun 2005 02:57:28 -0000	1.713
  +++ ChangeLog	19 Jun 2005 06:21:30 -0000	1.714
  @@ -1,5 +1,12 @@
   2005-06-18  Darin Adler  <darin at apple.com>
   
  +        Reviewed by Eric Seidel.
  +
  +        * pcre/get.c: (pcre_get_substring): Fix some computations so this works for UTF-16.
  +        This is unused in the current JavaScriptCore, but still good to fix.
  +
  +2005-06-18  Darin Adler  <darin at apple.com>
  +
           Change by Finlay Dobbie.
           Reviewed by me.
   
  
  
  
  1.3       +3 -3      JavaScriptCore/pcre/get.c
  
  Index: get.c
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/pcre/get.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- get.c	10 Aug 2004 21:35:09 -0000	1.2
  +++ get.c	19 Jun 2005 06:21:31 -0000	1.3
  @@ -199,12 +199,12 @@
     return PCRE_ERROR_NOSUBSTRING;
   stringnumber *= 2;
   yield = (ovector[stringnumber+1] - ovector[stringnumber]) * sizeof(pcre_char);
  -substring = (pcre_char *)(pcre_malloc)(yield + 1);
  +substring = (pcre_char *)(pcre_malloc)(yield + sizeof(pcre_char));
   if (substring == NULL) return PCRE_ERROR_NOMEMORY;
   memcpy(substring, subject + ovector[stringnumber], yield);
  -substring[yield] = 0;
  +substring[yield / sizeof(pcre_char)] = 0;
   *stringptr = substring;
  -return yield;
  +return yield / sizeof(pcre_char);
   }