components/libarchive/patches/archive_string.c.patch
author Drew Fisher <drew.fisher@oracle.com>
Fri, 13 Jun 2014 10:00:52 -0600
changeset 1947 b80524cd88bc
parent 1316 22b5cf35a3ea
permissions -rw-r--r--
18977267 common/openstack.p5m should have additional dependencies
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1316
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch was fed back to the upstream community:
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
http://code.google.com/p/libarchive/issues/detail?id=288
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
Given the response "This issue has been already fixed in master branch."
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
it should no longer be needed with the next release.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
--- libarchive/libarchive/archive_string.c.orig	Mon Mar 26 19:49:00 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
+++ libarchive/libarchive/archive_string.c	Tue Nov 27 18:10:35 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -1120,8 +1120,8 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 	}
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	sc->to_charset = strdup(tc);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 	if (sc->to_charset == NULL) {
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
-		free(sc);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
 		free(sc->from_charset);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
+		free(sc);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 		return (NULL);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 	}
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
 	archive_string_init(&sc->utftmp);