bugfix: fixed all the warnings from the clang static analyzer.

agentzh · agentzh · commit e05b5ffdc3cd · 2012-01-19T10:53:49.000+08:00
diff --git a/src/ngx_http_drizzle_output.c b/src/ngx_http_drizzle_output.c
@@ -446,7 +446,7 @@ ngx_http_drizzle_output_field(ngx_http_request_t *r, size_t offset,
     }
 
     /* field data */
-    if (len) {
+    if (len && field) {
         last = ngx_copy(last, field, (uint32_t) len);
     }
 
diff --git a/src/ngx_http_drizzle_upstream.c b/src/ngx_http_drizzle_upstream.c
@@ -883,7 +883,7 @@ ngx_http_upstream_drizzle_free_peer(ngx_peer_connection_t *pc,
         ngx_http_drizzle_keepalive_free_peer(pc, dp, dscf, state);
     }
 
-    if (pc->connection) {
+    if (pc && pc->connection) {
         dd("actually free the drizzle connection");
 
         ngx_http_upstream_drizzle_free_connection(pc->log, pc->connection,
diff --git a/src/ngx_http_drizzle_util.c b/src/ngx_http_drizzle_util.c
@@ -169,34 +169,6 @@ ngx_http_upstream_drizzle_finalize_request(ngx_http_request_t *r,
                        u->pipe->temp_file->file.fd);
     }
 
-#if (NGX_HTTP_CACHE)
-
-    if (u->cacheable && r->cache) {
-        time_t  valid;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http upstream cache fd: %d",
-                       r->cache->file.fd);
-
-        if (rc == NGX_HTTP_BAD_GATEWAY || rc == NGX_HTTP_GATEWAY_TIME_OUT) {
-
-            valid = ngx_http_file_cache_valid(u->conf->cache_valid, rc);
-
-            if (valid) {
-                r->cache->valid_sec = ngx_time() + valid;
-                r->cache->error = rc;
-            }
-        }
-
-# if defined(nginx_version) && (nginx_version >= 8047)
-        ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
-# else
-        ngx_http_file_cache_free(r, u->pipe->temp_file);
-# endif
-    }
-
-#endif
-
     if (u->header_sent
         && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
     {

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ ngx_http_drizzle_output_field(ngx_http_request_t *r, size_t offset,`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`/* field data */`
`449`		`- if (len) {`
	`449`	`+ if (len && field) {`
`450`	`450`	`last = ngx_copy(last, field, (uint32_t) len);`
`451`	`451`	`}`
`452`	`452`
Original file line number	Diff line number	Diff line change
`@@ -883,7 +883,7 @@ ngx_http_upstream_drizzle_free_peer(ngx_peer_connection_t *pc,`
`883`	`883`	`ngx_http_drizzle_keepalive_free_peer(pc, dp, dscf, state);`
`884`	`884`	`}`
`885`	`885`
`886`		`- if (pc->connection) {`
	`886`	`+ if (pc && pc->connection) {`
`887`	`887`	`dd("actually free the drizzle connection");`
`888`	`888`
`889`	`889`	`ngx_http_upstream_drizzle_free_connection(pc->log, pc->connection,`