Fix potential null deref with method logging.

fireeye · Apr 26, 2013 · d26ca8f · d26ca8f
1 parent b99a1c6
commit d26ca8f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/logger.c b/src/logger.c
@@ -166,10 +166,17 @@ logger_log_request_tostr(logger_t * logger, request_t * request, evbuf_t * buf)
             }
             break;
             case logger_argtype_meth:
-                /* log the method of the request */
-                evbuffer_add(buf, htparser_get_methodstr(upstream_c->parser),
-                             strlen(htparser_get_methodstr(upstream_c->parser)));
-                break;
+            {
+                const char * methstr - htparser_get_methodstr(upstream_c->parser);
+
+                if (methstr != NULL) {
+                    /* log the method of the request */
+                    evbuffer_add(buf, methstr, strlen(methstr));
+                } else {
+                    evbuffer_add(buf, "-", 1);
+                }
+            }
+            break;
             case logger_argtype_uri:
                 /* log the URI requested by the upstream */
                 if (upstream_r->uri && upstream_r->uri->path &&