Merge remote branch 'origin/develop' into feature/check_examples

src/dict.c

@@ -370,8 +370,8 @@ getdns_dict_set_dict(struct getdns_dict * dict, char *name,
 	struct getdns_dict *newdict;
 	getdns_return_t retval;
 
-	if (!dict || !name)
+	if (!dict || !name || !child_dict)
-		return GETDNS_RETURN_NO_SUCH_DICT_NAME;
+		return GETDNS_RETURN_INVALID_PARAMETER;
 
 	retval = getdns_dict_copy(child_dict, &newdict);
 	if (retval != GETDNS_RETURN_GOOD)

src/getdns/getdns.h

@@ -74,6 +74,8 @@ struct event_base;
 #define GETDNS_RETURN_DNSSEC_WITH_STUB_DISALLOWED_TEXT "A query was made with a context that is using stub resolution and a DNSSEC extension specified."
 #define GETDNS_RETURN_MEMORY_ERROR 310
 #define GETDNS_RETURN_MEMORY_ERROR_TEXT "Unable to allocate the memory required."
+#define GETDNS_RETURN_INVALID_PARAMETER  311
+#define GETDNS_RETURN_INVALID_PARAMETER_TEXT "A required parameter had an invalid value."
 /** @}
  */
 

src/getdns_error.c

@@ -63,6 +63,9 @@ getdns_lookup_table getdns_error_str[] = {
 	,
     {GETDNS_RETURN_MEMORY_ERROR,
              "Unable to allocate the memory required."}
+    ,
+    {GETDNS_RETURN_INVALID_PARAMETER,
+             GETDNS_RETURN_INVALID_PARAMETER_TEXT }
     ,
 	{0, ""}
 };