Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libxml2/patches/10.CVE-2011-0216.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Mon, 23 Jul 2012 03:17:23 -0500
branchs11-sru
changeset 2313 cee15dd34514
permissions -rw-r--r--
7100337 Problem with library/libxml 7072501 Problem with library/libxml 7131703 Problem with library/libxml 7008726 Problem with library/libxml 7171310 Problem with library/libxml 7150804 Problem with library/libxml
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2313
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     1
 
This patch taken directly from upstream:
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     2
 
http://git.gnome.org/browse/libxml2/commit/?id=69f04562f75212bfcabecd190ea8b06ace28ece2
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     3
 
--- libxml2-2.7.6/encoding.c	Thu Sep 24 08:31:59 2009
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     4
 
+++ libxml2-2.7.6/new.encoding.c	Mon Oct 24 11:11:46 2011
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     5
 
@@ -1771,7 +1771,7 @@
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     6
 
     if (in == NULL) return(-1);
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     7
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     8
 
     /* calculate space available */
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     9
 
-    written = out->size - out->use;
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    10
 
+    written = out->size - out->use - 1; /* count '\0' */
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    11
 
     toconv = in->use;
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    12
 
     /*
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    13
 
      * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    14
 
@@ -1892,7 +1892,7 @@
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    15
 
     toconv = in->use;
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    16
 
     if (toconv == 0)
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    17
 
         return (0);
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    18
 
-    written = out->size - out->use;
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
+    written = out->size - out->use - 1; /* count '\0' */
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    20
 
     if (toconv * 2 >= written) {
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    21
 
         xmlBufferGrow(out, out->size + toconv * 2);
cee15dd34514 7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    22
 
         written = out->size - out->use - 1;
upstream/oracle/userland-gate