浏览代码

Fix mg_calloc_ex if MEMORY_DEBUGGING enabled (#328)

bel 9 年之前
父节点
当前提交
0a2baa7de1
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/civetweb.c

+ 5 - 3
src/civetweb.c

@@ -800,7 +800,7 @@ mg_calloc_ex(size_t count, size_t size, const char *file, unsigned line)
 {
 {
 	void *data = mg_malloc_ex(size * count, file, line);
 	void *data = mg_malloc_ex(size * count, file, line);
 	if (data) {
 	if (data) {
-		memset(data, 0, size);
+		memset(data, 0, size * count);
 	}
 	}
 	return data;
 	return data;
 }
 }
@@ -11300,10 +11300,12 @@ ssl_get_client_cert_info(struct mg_connection *conn)
 		X509_NAME *iss = X509_get_issuer_name(cert);
 		X509_NAME *iss = X509_get_issuer_name(cert);
 		char buf1[1024];
 		char buf1[1024];
 		char buf2[1024];
 		char buf2[1024];
-		char *ret1 = X509_NAME_oneline(subj, buf1, sizeof(buf1));
-		char *ret2 = X509_NAME_oneline(iss, buf2, sizeof(buf2));
+		char *ret1 = X509_NAME_oneline(subj, buf1, (int)sizeof(buf1));
+		char *ret2 = X509_NAME_oneline(iss, buf2, (int)sizeof(buf2));
 
 
 		/* TODO: store this information somewhere */
 		/* TODO: store this information somewhere */
+        (void)ret1;
+        (void)ret2;
 
 
 		X509_free(cert);
 		X509_free(cert);
 	}
 	}