appliead memory leak bugfix from orig repo PR

MightyPork · Jan 27, 2017 · fba7cec · fba7cec
1 parent 439df03
commit fba7cec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/httpd.c b/core/httpd.c
@@ -760,18 +760,20 @@ void ICACHE_FLASH_ATTR httpdRecvCb(ConnTypePtr rconn, char *remIp, int remPort,
 	int x, r;
 	char *p, *e;
 	httpdPlatLock();
-	char *sendBuff=malloc(HTTPD_MAX_SENDBUFF_LEN);
-	if (sendBuff==NULL) {
-		error("Malloc sendBuff failed!");
+
+	HttpdConnData *conn=httpdFindConnData(rconn, remIp, remPort);
+	if (conn==NULL) {
 		httpdPlatUnlock();
 		return;
 	}
 
-	HttpdConnData *conn=httpdFindConnData(rconn, remIp, remPort);
-	if (conn==NULL) {
+	char *sendBuff=malloc(HTTPD_MAX_SENDBUFF_LEN);
+	if (sendBuff==NULL) {
+		error("Malloc sendBuff failed!");
 		httpdPlatUnlock();
 		return;
 	}
+
 	conn->priv->sendBuff=sendBuff;
 	conn->priv->sendBuffLen=0;
 	conn->priv->corsToken[0] = 0;

diff --git a/espfs/espfs.c b/espfs/espfs.c
@@ -185,6 +185,7 @@ EspFsFile ICACHE_FLASH_ATTR *espFsOpen(const char *fileName) {
 #endif
 			} else {
 				error("[EspFS] Invalid compression: %d", h.compression);
+				free(r);
 				return NULL;
 			}
 			return r;