Fix file serving.

Author: lpereira

lwan-serve-files.c

@@ -108,12 +108,14 @@ _serve_file_stream(lwan_t* l, lwan_request_t *request, void *data)
 lwan_http_status_t
 serve_files(lwan_request_t *request, void *root_directory)
 {
- lwan_response_t *response;
+ lwan_response_t *response = NULL;
  lwan_http_status_t return_status = HTTP_OK;
  char path_to_canonicalize[PATH_MAX];
  char *canonical_path;
  char *canonical_root;
 
+ lwan_request_set_response(request, response);
+
  /* FIXME: ``canonical_root'' should be cached somewhere. */
  canonical_root = canonicalize_file_name(root_directory);
  if (!canonical_root)
@@ -147,13 +149,24 @@ serve_files(lwan_request_t *request, void *root_directory)
  }
 
  response = calloc(1, sizeof(*response));
+ if (!response) {
+ free(canonical_path);
+ return_status = HTTP_INTERNAL_ERROR;
+ goto end_no_reset_stream_content;
+ }
+
  response->mime_type = (char*)lwan_determine_mime_type_for_file_name(canonical_path);
  response->stream_content.callback = _serve_file_stream;
  response->stream_content.data = canonical_path;
 
  lwan_request_set_response(request, response);
+ goto end_no_reset_stream_content;
 
 end:
+ if (response)
+ request->response->stream_content.callback = NULL;
+
+end_no_reset_stream_content:
  free(canonical_root);
 
  return return_status;