parse_object: check if buffer is non-NULL before freeing it
PATCH 1/1 parse_object: check if buffer is non-NULL before freeing it
Two code paths may cause this and other places in the source have the courtesy to do the check.
--- object.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
object.c +2 -1
@@ -173,7 +173,8 @@ struct object *parse_object(const unsign }else { obj =NULL ; } -free (buffer); +if (buffer) +free (buffer);return obj; }return NULL ;
Signature · 4 lines
1.4.2.g2f76-dirty -- Jonas Fonseca
Quoted 2 lines · Jonas Fonseca
Two code paths may cause this and other places in the source have the courtesy to do the check.
Eh, free(NULL) should work just fine. It is "other places" that is misguided and needs to be fixed.
- >8 -
[PATCH] free(NULL) is perfectly valid.
Jonas noticed some places say "if (X) free(X)" which is totally unnecessary.
--- builtin-apply.c | 6 ++---- builtin-fmt-merge-msg.c | 3 +-- builtin-repo-config.c | 6 ++---- builtin-rev-list.c | 6 ++---- config.c | 6 ++---- fetch.c | 3 +-- http-fetch.c | 13 ++++--------- http-push.c | 13 ++++--------- path-list.c | 3 +-- refs.c | 6 ++---- 10 files changed, 21 insertions(+), 44 deletions(-)
builtin-apply.c +2 -4
@@ -1131,8 +1131,7 @@ static struct fragment *parse_binary_hunreturn frag; corrupt: -if (data) -free (data); +free (data); *status_p =-1 ;error ("corrupt binary patch at line %d: %.*s" , linenr-1 , llen-1 , buffer);
@@ -1329,8 +1328,7 @@ static void show_stats(struct patch *patprintf (" %s%-*s |%5d %.*s%.*s\n" , prefix, len, name, patch->lines_added + patch->lines_deleted, add, pluses, del, minuses); -if (qname) -free (qname); +free (qname); }static int read_old_data (struct stat *st,const char *path,void *buf,unsigned long size)
builtin-fmt-merge-msg.c +1 -2
@@ -55,8 +55,7 @@ static void free_list(struct list *list)for (i =0 ; i < list->nr; i++) {free (list->list[i]); -if (list->payload[i]) -free (list->payload[i]); +free (list->payload[i]); }free (list->list);free (list->payload);
builtin-repo-config.c +2 -4
@@ -122,10 +122,8 @@ static int get_value(const char* key_, c ret = (seen ==1 ) ?0 :1 ; free_strings: -if (repo_config) -free (repo_config); -if (global) -free (global); +free (repo_config); +free (global);return ret; }
builtin-rev-list.c +2 -4
@@ -93,10 +93,8 @@ static void show_commit(struct commit *cfree_commit_list (commit->parents); commit->parents =NULL ; } -if (commit->buffer) { -free (commit->buffer); - commit->buffer =NULL ; - } +free (commit->buffer); + commit->buffer =NULL ; } static void process_blob(struct blob *blob,
config.c +2 -4
@@ -361,8 +361,7 @@ int git_config(config_fn_t fn) } ret +=git_config_from_file (fn, filename); -if (repo_config) -free (repo_config); +free (repo_config);return ret; }
@@ -734,8 +733,7 @@ int git_config_set_multivar(const char* out_free:if (0 <= fd)close (fd); -if (config_filename) -free (config_filename); +free (config_filename);if (lock_file) {unlink (lock_file);free (lock_file);
fetch.c +1 -2
@@ -302,8 +302,7 @@ int pull(int targets, char **target, conif (ret) goto unlock_and_fail; } -if (msg) -free (msg); +free (msg);return 0 ;
http-fetch.c +4 -9
@@ -696,10 +696,8 @@ xml_start_tag(void *userData, const charstrcat (ctx->name,"." );strcat (ctx->name, c); -if (ctx->cdata) { -free (ctx->cdata); - ctx->cdata =NULL ; - } +free (ctx->cdata); + ctx->cdata =NULL ; ctx->userFunc (ctx,0 ); }
@@ -726,8 +724,7 @@ static void xml_cdata(void *userData, const XML_Char *s, int len) {struct xml_ctx *ctx = (struct xml_ctx *)userData; -if (ctx->cdata) -free (ctx->cdata); +free (ctx->cdata); ctx->cdata =xmalloc (len +1 );strlcpy (ctx->cdata, s, len +1 ); }
@@ -765,9 +762,7 @@ static void handle_remote_ls_ctx(struct ls->dentry_flags |=IS_DIR ; } }else if (!strcmp (ctx->name,DAV_PROPFIND_RESP )) { -if (ls->dentry_name) { -free (ls->dentry_name); - } +free (ls->dentry_name); ls->dentry_name =NULL ; ls->dentry_flags =0 ; }
http-push.c +4 -9
@@ -1238,10 +1238,8 @@ xml_start_tag(void *userData, const charstrcat (ctx->name,"." );strcat (ctx->name, c); -if (ctx->cdata) { -free (ctx->cdata); - ctx->cdata =NULL ; - } +free (ctx->cdata); + ctx->cdata =NULL ; ctx->userFunc (ctx,0 ); }
@@ -1268,8 +1266,7 @@ static void xml_cdata(void *userData, const XML_Char *s, int len) {struct xml_ctx *ctx = (struct xml_ctx *)userData; -if (ctx->cdata) -free (ctx->cdata); +free (ctx->cdata); ctx->cdata =xmalloc (len +1 );strlcpy (ctx->cdata, s, len +1 ); }
@@ -1518,9 +1515,7 @@ static void handle_remote_ls_ctx(struct ls->dentry_flags |=IS_DIR ; } }else if (!strcmp (ctx->name,DAV_PROPFIND_RESP )) { -if (ls->dentry_name) { -free (ls->dentry_name); - } +free (ls->dentry_name); ls->dentry_name =NULL ; ls->dentry_flags =0 ; }
path-list.c +1 -2
@@ -85,8 +85,7 @@ void path_list_clear(struct path_list *lfor (i =0 ; i < list->nr; i++) {if (list->strdup_paths)free (list->items[i].path); -if (list->items[i].util) -free (list->items[i].util); +free (list->items[i].util); }free (list->items); }
refs.c +2 -4
@@ -348,10 +348,8 @@ void unlock_ref(struct ref_lock *lock)if (lock->lk)rollback_lock_file (lock->lk); } -if (lock->ref_file) -free (lock->ref_file); -if (lock->log_file) -free (lock->log_file); +free (lock->ref_file); +free (lock->log_file);free (lock); }
Signature · 1 line
1.4.2.g2f76
Quoted 3 lines · Junio C Hamano
Eh, free(NULL) should work just fine. It is "other places" that is misguided and needs to be fixed.
Well, some very old libraries will SIGSEGV on free(NULL).
Admittedly those libraries are either very old or _very_ broken, but if you want to be strictly portable, you should not ever pass NULL to free(), unless you actually got it from a malloc(0) (and even then, it might be a really broken libc that just ran out of memory).
I actually suspect we should wrap all free() calls as "xfree()", which may also help us some day if we want to do any memory usage statistics.
Linus
Quoted 11 lines · Linus Torvalds
Quoted 3 lines · Junio C Hamano
Eh, free(NULL) should work just fine. It is "other places" that is misguided and needs to be fixed.
Well, some very old libraries will SIGSEGV on free(NULL).
Admittedly those libraries are either very old or _very_ broken, but if you want to be strictly portable, you should not ever pass NULL to
free(), unless you actually got it from a malloc(0) (and even then, it might be a really broken libc that just ran out of memory).
Fair enough, but I think there are many places we already assume the library handles free(NULL) sensibly.
Quoted 2 lines
I actually suspect we should wrap all
free()calls as "xfree()", which may also help us some day if we want to do any memory usage statistics.
That sounds sensible.
Another thing I was thinking about was to extend the existing XMALLOC_POISON debugging to allow also xrealloc()'ed area. That would unfortunately involve wrapping strdup() and x*alloc() to make sure all allocations we do go through xmalloc() and then store the current allocation size somewhere hidden (immediately before, perhaps) in the area xmalloc() returns, but at that point running git under valgrind would probably be easier.