Fix missing null-check for 'Soup.MessageHeaders.get_content_type'

Fix #211 by resolving the caused memory leak.
valum-framework · Jun 15, 2017 · 6bf69d6 · 6bf69d6
1 parent 0f0592a
commit 6bf69d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/valum/valum-content-negotiation.vala b/src/valum/valum-content-negotiation.vala
@@ -180,6 +180,10 @@ namespace Valum.ContentNegotiation {
 		return negotiate ("Accept-Charset", charsets, (req, res, next, ctx, charset) => {
 			HashTable<string, string> @params;
 			var content_type   = res.headers.get_content_type (out @params) ?? "application/octet-stream";
+			if (@params == null) {
+				@params = new HashTable<string, string> ((GLib.HashFunc<string>) Soup.str_case_hash,
+				                                         (GLib.EqualFunc<string>) Soup.str_case_equal);
+			}
 			@params["charset"] = charset;
 			res.headers.set_content_type (content_type, @params);
 			return forward (req, res, next, ctx, charset);

diff --git a/src/valum/valum-multipart.vala b/src/valum/valum-multipart.vala
@@ -33,7 +33,7 @@ namespace Valum {
 		return (req, res, next, ctx) => {
 			HashTable<string, string> @params;
 			if (req.headers.get_content_type (out @params).has_prefix ("multipart/")) {
-				if (!@params.contains ("boundary")) {
+				if (@params == null || !@params.contains ("boundary")) {
 					throw new ClientError.BAD_REQUEST ("The 'boundary' parameter is missing in the 'Content-Type' header.");
 				}
 				return forward (req, res, next, ctx, new MultipartInputStream (req.body, @params["boundary"]));