projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Off-by-one error in get_path_prefix(), found by Valgrind
[git.git]
/
git-compat-util.h
diff --git
a/git-compat-util.h
b/git-compat-util.h
index
0c98c99
..
5d543d2
100644
(file)
--- a/
git-compat-util.h
+++ b/
git-compat-util.h
@@
-1,6
+1,16
@@
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
+#ifndef FLEX_ARRAY
+#if defined(__GNUC__) && (__GNUC__ < 3)
+#define FLEX_ARRAY 0
+#else
+#define FLEX_ARRAY /* empty */
+#endif
+#endif
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
@@
-55,6
+65,11
@@
extern int gitfakemunmap(void *start, size_t length);
extern int gitsetenv(const char *, const char *, int);
#endif
extern int gitsetenv(const char *, const char *, int);
#endif
+#ifdef NO_UNSETENV
+#define unsetenv gitunsetenv
+extern void gitunsetenv(const char *);
+#endif
+
#ifdef NO_STRCASESTR
#define strcasestr gitstrcasestr
extern char *gitstrcasestr(const char *haystack, const char *needle);
#ifdef NO_STRCASESTR
#define strcasestr gitstrcasestr
extern char *gitstrcasestr(const char *haystack, const char *needle);
@@
-63,6
+78,8
@@
extern char *gitstrcasestr(const char *haystack, const char *needle);
static inline void *xmalloc(size_t size)
{
void *ret = malloc(size);
static inline void *xmalloc(size_t size)
{
void *ret = malloc(size);
+ if (!ret && !size)
+ ret = malloc(1);
if (!ret)
die("Out of memory, malloc failed");
return ret;
if (!ret)
die("Out of memory, malloc failed");
return ret;
@@
-71,6
+88,8
@@
static inline void *xmalloc(size_t size)
static inline void *xrealloc(void *ptr, size_t size)
{
void *ret = realloc(ptr, size);
static inline void *xrealloc(void *ptr, size_t size)
{
void *ret = realloc(ptr, size);
+ if (!ret && !size)
+ ret = realloc(ptr, 1);
if (!ret)
die("Out of memory, realloc failed");
return ret;
if (!ret)
die("Out of memory, realloc failed");
return ret;
@@
-79,6
+98,8
@@
static inline void *xrealloc(void *ptr, size_t size)
static inline void *xcalloc(size_t nmemb, size_t size)
{
void *ret = calloc(nmemb, size);
static inline void *xcalloc(size_t nmemb, size_t size)
{
void *ret = calloc(nmemb, size);
+ if (!ret && (!nmemb || !size))
+ ret = calloc(1, 1);
if (!ret)
die("Out of memory, calloc failed");
return ret;
if (!ret)
die("Out of memory, calloc failed");
return ret;