From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2010 21:02:16 +0000 (-0800)
Subject: Merge branch 'il/maint-xmallocz' into maint
X-Git-Tag: v1.6.6.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c329898abb167f05e37f3d0305e833127a26a4d0?hp=-c

Merge branch 'il/maint-xmallocz' into maint

* il/maint-xmallocz:
Fix integer overflow in unpack_compressed_entry()
Fix integer overflow in unpack_sha1_rest()
Fix integer overflow in patch_delta()
Add xmallocz()
---

c329898abb167f05e37f3d0305e833127a26a4d0
diff --combined git-compat-util.h
index a979e41c15,31e2ef9e9e..812f55af89
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -96,7 -96,6 +96,7 @@@
  #include <sys/poll.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
 +#include <termios.h>
  #ifndef NO_SYS_SELECT_H
  #include <sys/select.h>
  #endif
@@@ -190,7 -189,6 +190,7 @@@ extern char *gitbasename(char *)
  
  /* General helper functions */
  extern NORETURN void usage(const char *err);
 +extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
  extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
  extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
  extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@@ -345,6 -343,7 +345,7 @@@ extern void release_pack_memory(size_t
  
  extern char *xstrdup(const char *str);
  extern void *xmalloc(size_t size);
+ extern void *xmallocz(size_t size);
  extern void *xmemdupz(const void *data, size_t len);
  extern char *xstrndup(const char *str, size_t len);
  extern void *xrealloc(void *ptr, size_t size);