浏览代码

Fix warning from static source code analysis

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

+ 9 - 1
src/civetweb.c

@@ -8685,7 +8685,7 @@ handle_static_file_request(struct mg_connection *conn,
 	char gz_path[PATH_MAX];
 	char gz_path[PATH_MAX];
 	const char *encoding = "";
 	const char *encoding = "";
 	const char *cors1, *cors2, *cors3;
 	const char *cors1, *cors2, *cors3;
-	int allow_on_the_fly_compression = conn->accept_gzip;
+	int allow_on_the_fly_compression;
 
 
 	if ((conn == NULL) || (conn->ctx == NULL) || (filep == NULL)) {
 	if ((conn == NULL) || (conn->ctx == NULL) || (filep == NULL)) {
 		return;
 		return;
@@ -8711,6 +8711,8 @@ handle_static_file_request(struct mg_connection *conn,
 	/* if this file is in fact a pre-gzipped file, rewrite its filename
 	/* if this file is in fact a pre-gzipped file, rewrite its filename
 	 * it's important to rewrite the filename after resolving
 	 * it's important to rewrite the filename after resolving
 	 * the mime type from it, to preserve the actual file's type */
 	 * the mime type from it, to preserve the actual file's type */
+	allow_on_the_fly_compression = conn->accept_gzip;
+
 	if (filep->stat.is_gzipped) {
 	if (filep->stat.is_gzipped) {
 		mg_snprintf(conn, &truncated, gz_path, sizeof(gz_path), "%s.gz", path);
 		mg_snprintf(conn, &truncated, gz_path, sizeof(gz_path), "%s.gz", path);
 
 
@@ -8915,6 +8917,12 @@ mg_send_mime_file2(struct mg_connection *conn,
                    const char *additional_headers)
                    const char *additional_headers)
 {
 {
 	struct mg_file file = STRUCT_FILE_INITIALIZER;
 	struct mg_file file = STRUCT_FILE_INITIALIZER;
+
+	if (!conn) {
+		/* No conn */
+		return;
+	}
+
 	if (mg_stat(conn, path, &file.stat)) {
 	if (mg_stat(conn, path, &file.stat)) {
 		if (file.stat.is_directory) {
 		if (file.stat.is_directory) {
 			if (!conn) {
 			if (!conn) {