X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=587870f8a85fb170ec408dc5aedd30eab7b4b22e;hp=88a27e1a7684cf83d6a82b422a76cf59fcd7e90c;hb=1374172d6c717de67faf91519b100b5348329aee;hpb=1bb903f3aad484c7adf638af3365cb7c668d3281

diff --git a/http_send_api.c b/http_send_api.c
index 88a27e1..587870f 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -484,15 +484,13 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 	char *ct = NULL;
 
 #ifdef HTTP_HAVE_MAGIC
-	struct magic_set *magic;
+	struct magic_set *magic = NULL;
 	
 	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
 	
-	/*	magic_load() fails if MAGIC_MIME is set because it 
-		cowardly adds .mime to the file name */
-	magic = magic_open(magicmode &~ MAGIC_MIME);
-	
-	if (!magic) {
+	if (!data_ptr) {
+		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Supplied payload is empty");
+	} else if (!(magic = magic_open(magicmode &~ MAGIC_MIME))) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
 	} else if (-1 == magic_load(magic, magicfile)) {
 		http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic));