- added fixes missing in Debian's backport

Changed files:
    libxml-urlbound.patch -> 1.2

diff --git a/libxml-urlbound.patch b/libxml-urlbound.patch
index 26650339865cdd30319d2831e52efcb3f848120b..8835df52c3bbd95c2315cd92b00cf2923bf2a9c1 100644 (file)
--- a/libxml-urlbound.patch
+++ b/libxml-urlbound.patch
@@ -27,6 +27,15 @@
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
            buf[index] = 0;
            ctxt->protocol = xmlMemStrdup(buf);
+@@ -236,7 +236,7 @@
+     if (*cur == 0) return;
+ 
+     buf[index] = 0;
+-    while (1) {
++    while (index < (XML_NANO_MAX_URLBUF - 1)) {
+         if (cur[0] == ':') {
+           buf[index] = 0;
+           ctxt->hostname = xmlMemStrdup(buf);
 @@ -263,7 +265,7 @@
      else {
          index = 0;
@@ -54,6 +63,15 @@
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
            buf[index] = 0;
            if (strcmp(ctxt->protocol, buf))
+@@ -318,7 +318,7 @@
+       return(-1);
+ 
+     buf[index] = 0;
+-    while (1) {
++    while (index < (XML_NANO_MAX_URLBUF - 1)) {
+         if (cur[0] == ':') {
+           buf[index] = 0;
+           if (strcmp(ctxt->hostname, buf))
 @@ -353,7 +355,7 @@
      else {
          index = 0;
@@ -81,6 +99,15 @@
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
            buf[index] = 0;
            index = 0;
+@@ -407,7 +407,7 @@
+     if (*cur == 0) return;
+ 
+     buf[index] = 0;
+-    while (1) {
++    while (index < (XML_NANO_MAX_URLBUF - 1)) {
+         if (cur[0] == ':') {
+           buf[index] = 0;
+           proxy = xmlMemStrdup(buf);
 --- libxml-1.8.17.orig/nanohttp.c
 +++ libxml-1.8.17/nanohttp.c
 @@ -161,6 +161,7 @@
@@ -100,6 +127,15 @@
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
            buf[index] = 0;
            ctxt->protocol = xmlMemStrdup(buf);
+@@ -191,7 +191,7 @@
+     if (*cur == 0) return;
+ 
+     buf[index] = 0;
+-    while (1) {
++    while (index < indexMax) {
+         if (cur[0] == ':') {
+           buf[index] = 0;
+           ctxt->hostname = xmlMemStrdup(buf);
 @@ -219,7 +220,7 @@
      else {
          index = 0;
@@ -126,3 +162,12 @@
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
            buf[index] = 0;
            index = 0;
+@@ -272,7 +272,7 @@
+     if (*cur == 0) return;
+ 
+     buf[index] = 0;
+-    while (1) {
++    while (index < indexMax) {
+         if (cur[0] == ':') {
+           buf[index] = 0;
+           proxy = xmlMemStrdup(buf);