components/libarchive/patches/archive_string.c.patch
author John Beck <John.Beck@Oracle.COM>
Mon, 17 Jun 2013 14:23:50 -0700
branchs11-update
changeset 2651 9b563675339e
permissions -rw-r--r--
PSARC 2012/356 libarchive 15959922 add libarchive to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2651
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch was fed back to the upstream community:
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
http://code.google.com/p/libarchive/issues/detail?id=288
9b563675339e 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."
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
it should no longer be needed with the next release.
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
9b563675339e 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
9b563675339e 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
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -1120,8 +1120,8 @@
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 	}
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	sc->to_charset = strdup(tc);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 	if (sc->to_charset == NULL) {
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
-		free(sc);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
 		free(sc->from_charset);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
+		free(sc);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 		return (NULL);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 	}
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
 	archive_string_init(&sc->utftmp);