diff options
author | Justin Maggard <jmaggard@users.sourceforge.net> | 2011-01-26 01:40:37 +0300 |
---|---|---|
committer | Justin Maggard <jmaggard@users.sourceforge.net> | 2011-01-26 01:40:37 +0300 |
commit | 91fc3728e095a310e35bf837c030056ef4e287a7 (patch) | |
tree | 4bcde9a03d2bca76dce574f4cb21fac6ac072fc3 | |
parent | ba7ac3701e81dd0a4262b60bbdf50e3f4ba59290 (diff) |
* Fix a couple potential frees of invalid pointers.
-rw-r--r-- | log.c | 6 | ||||
-rw-r--r-- | upnphttp.c | 8 |
2 files changed, 7 insertions, 7 deletions
@@ -135,7 +135,11 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f // user log va_start(ap, fmt); //vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - vasprintf(&errbuf, fmt, ap); + if (vasprintf(&errbuf, fmt, ap) == -1) + { + va_end(ap); + return; + } va_end(ap); // timestamp @@ -565,7 +565,7 @@ Send501(struct upnphttp * h) static const char * findendheaders(const char * s, int len) { - while(len-->0) + while(len-- > 0) { if(s[0]=='\r' && s[1]=='\n' && s[2]=='\r' && s[3]=='\n') return s; @@ -585,13 +585,9 @@ sendXMLdesc(struct upnphttp * h, char * (f)(int *)) { DPRINTF(E_ERROR, L_HTTP, "Failed to generate XML description\n"); Send500(h); - free(desc); return; } - else - { - BuildResp_upnphttp(h, desc, len); - } + BuildResp_upnphttp(h, desc, len); SendResp_upnphttp(h); CloseSocket_upnphttp(h); free(desc); |