diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-11 07:01:58 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-11 07:01:58 +0100 |
| commit | ccc1c731529de16f6fa4064fd992a8f63d7cfc26 (patch) | |
| tree | dc5b96634cb255cfcbee1e57079d32491db9fc5e /lib/libalpm/util.h | |
| parent | 0a65de10b1cd8bd450e47e735cb909eec13822d0 (diff) | |
| download | pacman-ccc1c731529de16f6fa4064fd992a8f63d7cfc26.tar.gz pacman-ccc1c731529de16f6fa4064fd992a8f63d7cfc26.tar.xz | |
Use dynamic string allocation in package structures
This also affects all structures with static strings, such as depmiss,
conflict, etc. This should help a lot with memory usage, and hopefully make
things a bit more "idiot proof".
Currently our pactest pass/fail rate is identical before and after this
patch. This is not to say it is a perfect patch- I have yet to pull valgrind
out. However, this should be quite safe to use in all situations from here
on out, and we can start plugging the memleaks.
Original-work-by: Aaron Griffin <aaronmgriffin@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/util.h')
| -rw-r--r-- | lib/libalpm/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 3ffe6328..8db26350 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -43,7 +43,8 @@ #define MALLOC(p, s, action) do { p = calloc(1, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) #define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) -#define STRDUP(r, s, action) do { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } while(0) +/* This strdup macro is NULL safe- copying NULL will yield NULL */ +#define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) #define FREE(p) do { if(p) { free(p); p = NULL; } } while(0) |