diff options
author | Gaurav Gupta <g.gupta@samsung.com> | 2014-07-14 17:50:27 +0800 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2014-07-14 17:50:27 +0800 |
commit | 1811add768cabe36f763c960a40698418c5cbe47 (patch) | |
tree | daa5083c3c70884c5a87ab56f7c76946cf565dd7 | |
parent | c836ba66e57d4d9f90f1dc7a827625c99622408f (diff) | |
download | libxml2-1811add768cabe36f763c960a40698418c5cbe47.tar.gz |
Fix various Missing Null checks
For https://bugzilla.gnome.org/show_bug.cgi?id=732823
-rw-r--r-- | hash.c | 3 | ||||
-rw-r--r-- | nanoftp.c | 10 | ||||
-rw-r--r-- | nanohttp.c | 12 |
3 files changed, 17 insertions, 8 deletions
@@ -984,6 +984,9 @@ xmlHashCopy(xmlHashTablePtr table, xmlHashCopier f) { return(NULL); ret = xmlHashCreate(table->size); + if (ret == NULL) + return(NULL); + if (table->table) { for(i = 0; i < table->size; i++) { if (table->table[i].valid == 0) @@ -1244,7 +1244,13 @@ xmlNanoFTPConnectTo(const char *server, int port) { if (port <= 0) return(NULL); ctxt = (xmlNanoFTPCtxtPtr) xmlNanoFTPNewCtxt(NULL); + if (ctxt == NULL) + return(NULL); ctxt->hostname = xmlMemStrdup(server); + if (ctxt->hostname == NULL) { + xmlNanoFTPFreeCtxt(ctxt); + return(NULL); + } if (port != 0) ctxt->port = port; res = xmlNanoFTPConnect(ctxt); @@ -1321,8 +1327,8 @@ xmlNanoFTPDele(void *ctx, const char *file) { int len; int res; - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET) || (file == NULL)) return(-1); - if (file == NULL) return (0); + if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET) || + (file == NULL)) return(-1); /* * Expected response code for DELE: @@ -1363,17 +1363,17 @@ xmlNanoHTTPMethodRedir(const char *URL, const char *method, const char *input, xmlNanoHTTPInit(); retry: - if (redirURL == NULL) + if (redirURL == NULL) { ctxt = xmlNanoHTTPNewCtxt(URL); - else { + if (ctxt == NULL) + return(NULL); + } else { ctxt = xmlNanoHTTPNewCtxt(redirURL); + if (ctxt == NULL) + return(NULL); ctxt->location = xmlMemStrdup(redirURL); } - if ( ctxt == NULL ) { - return ( NULL ); - } - if ((ctxt->protocol == NULL) || (strcmp(ctxt->protocol, "http"))) { __xmlIOErr(XML_FROM_HTTP, XML_HTTP_URL_SYNTAX, "Not a valid HTTP URI"); xmlNanoHTTPFreeCtxt(ctxt); |