glib r7124 - in branches/glib-2-16: . glib/pcre

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jul  1 03:29:08 2008
New Revision: 7124
URL: http://svn.gnome.org/viewvc/glib?rev=7124&view=rev

Log:
        * glib/pcre/pcre_compile.c: Apply fix for CVE-2008-2371 to
        fix a heap-based buffer overflow.



Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/glib/pcre/pcre_compile.c

Modified: branches/glib-2-16/glib/pcre/pcre_compile.c
==============================================================================
--- branches/glib-2-16/glib/pcre/pcre_compile.c	(original)
+++ branches/glib-2-16/glib/pcre/pcre_compile.c	Tue Jul  1 03:29:08 2008
@@ -4807,7 +4807,7 @@
                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
             {
             cd->external_options = newoptions;
-            options = newoptions;
+            options = *optionsptr = newoptions;
             }
          else
             {