# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1355161870 0
# Node ID 7c034ee6124450612bf5e7d692efdc884cd33a66
# Parent  5e9d5786ec06da18c95f271ec2f4174c92644048
Merge of r4919: fixed segfault on PUT in dav module.

Dav: fixed segfault on PUT if body was already read (ticket #238).

If request body reading happens with different options it's possible
that there will be no r->request_body->temp_file available (or even
no r->request_body available if body was discarded).  Return internal
server error in this case instead of committing suicide by dereferencing
a null pointer.

diff -r 5e9d5786ec06 -r 7c034ee61244 src/http/modules/ngx_http_dav_module.c
--- a/src/http/modules/ngx_http_dav_module.c	Mon Dec 10 17:46:51 2012 +0000
+++ b/src/http/modules/ngx_http_dav_module.c	Mon Dec 10 17:51:10 2012 +0000
@@ -209,6 +209,11 @@
     ngx_ext_rename_file_t     ext;
     ngx_http_dav_loc_conf_t  *dlcf;
 
+    if (r->request_body == NULL || r->request_body->temp_file == NULL) {
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
     ngx_http_map_uri_to_path(r, &path, &root, 0);
 
     path.len--;