Merge branch 'v5.0'

THANKS

@@ -47,6 +47,7 @@ has been important. :-) In alphabetical order:
   - Mikko Pouru
   - Robert Readman
   - Bernhard Reutner-Fischer
+  - Cristian Rodríguez
   - Christian von Roques
   - Jukka Salmi
   - Alexandre Sauvé

src/common/sysdefs.h

@@ -180,4 +180,10 @@ typedef unsigned char _Bool;
 #	define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
 #endif
 
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
+#	define lzma_attr_alloc_size(x) __attribute__((__alloc_size__(x)))
+#else
+#	define lzma_attr_alloc_size(x)
+#endif
+
 #endif

src/liblzma/common/common.h

@@ -205,7 +205,7 @@ struct lzma_internal_s {
 
 /// Allocates memory
 extern void *lzma_alloc(size_t size, lzma_allocator *allocator)
-		lzma_attribute((malloc));
+		lzma_attribute((malloc)) lzma_attr_alloc_size(1);
 
 /// Frees memory
 extern void lzma_free(void *ptr, lzma_allocator *allocator);

src/scripts/xzdiff.in

@@ -74,9 +74,9 @@ if test $# -eq 1; then
     *[-.]xz | *[-.]lzma | *.t[lx]z)
       ;;
     *[-.]bz2 | *.tbz | *.tbz2)
-      xz1=$bzip2;;
+      xz1=bzip2;;
     *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z)
-      xz1=$gzip;;
+      xz1=gzip;;
     *)
       echo >&2 "$0: $1: Unknown compressed file name suffix"
       exit 2;;
@@ -95,12 +95,12 @@ if test $# -eq 1; then
   )
 elif test $# -eq 2; then
   case $1 in
-    *[-.]bz2 | *.tbz | *.tbz2) xz1=$bzip2;;
-    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz1=$gzip;;
+    *[-.]bz2 | *.tbz | *.tbz2) xz1=bzip2;;
+    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz1=gzip;;
   esac
   case $2 in
-    *[-.]bz2 | *.tbz | *.tbz2) xz2=$bzip2;;
-    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz2=$gzip;;
+    *[-.]bz2 | *.tbz | *.tbz2) xz2=bzip2;;
+    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz2=gzip;;
   esac
   case $1 in
     *[-.][zZ] | *_z | *[-.][gx]z | *[-.]bz2 | *[-.]lzma | *.t[abglx]z | *.tbz2 | -)

src/xz/util.h

@@ -19,11 +19,12 @@
 
 
 /// \brief      Safe realloc() that never returns NULL
-extern void *xrealloc(void *ptr, size_t size);
+extern void *xrealloc(void *ptr, size_t size)
+		lzma_attribute((malloc)) lzma_attr_alloc_size(2);
 
 
 /// \brief      Safe strdup() that never returns NULL
-extern char *xstrdup(const char *src);
+extern char *xstrdup(const char *src) lzma_attribute((malloc));
 
 
 /// \brief      Fancy version of strtoull()