Changeset View
Changeset View
Standalone View
Standalone View
head/textproc/libxml2/files/patch-uri.c
Revert the following commit, it makes the freebsd doc chain fail. | Revert the following commit, it makes the freebsd doc chain fail. | ||||
From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001 | From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001 | ||||
From: Dennis Filder <d.filder@web.de> | From: Dennis Filder <d.filder@web.de> | ||||
Date: Fri, 13 Jun 2014 14:56:14 +0800 | Date: Fri, 13 Jun 2014 14:56:14 +0800 | ||||
Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths | Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths | ||||
For https://bugzilla.gnome.org/show_bug.cgi?id=731063 | For https://bugzilla.gnome.org/show_bug.cgi?id=731063 | ||||
xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns | xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns | ||||
bogus values when called with URIs that have rootless paths | bogus values when called with URIs that have rootless paths | ||||
(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be | (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be | ||||
correct) | correct) | ||||
--- uri.c.orig 2016-05-22 01:49:02 UTC | --- uri.c.orig 2019-10-22 18:46:01 UTC | ||||
+++ uri.c | +++ uri.c | ||||
@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) { | @@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) { | ||||
if (temp == NULL) goto mem_error; | if (temp == NULL) goto mem_error; | ||||
ret = temp; | ret = temp; | ||||
} | } | ||||
+ ret[len++] = '/'; | + ret[len++] = '/'; | ||||
+ ret[len++] = '/'; | + ret[len++] = '/'; | ||||
} | } | ||||
if (uri->path != NULL) { | if (uri->path != NULL) { | ||||
p = uri->path; | p = uri->path; |