Merge branch '2.2'

Closes GH-43.

diff --cc src/load.c
Simple merge

diff --cc test/suites/api/test_load.c
index fb4c734,810b745..8143d46
--- 1/test/suites/api/test_load.c
--- 2/test/suites/api/test_load.c
+++ b/test/suites/api/test_load.c
@@@ -50,36 -50,32 +50,59 @@@ static void disable_eof_check(
      json_decref(json);
  }
  
 +static void decode_any()
 +{
 +    json_t *json;
 +    json_error_t error;
 +
 +    json = json_loads("\"foo\"", JSON_DECODE_ANY, &error);
 +    if (!json || !json_is_string(json))
 +        fail("json_load decoded any failed - string");
 +    json_decref(json);
 +
 +    json = json_loads("42", JSON_DECODE_ANY, &error);
 +    if (!json || !json_is_integer(json))
 +        fail("json_load decoded any failed - integer");
 +    json_decref(json);
 +
 +    json = json_loads("true", JSON_DECODE_ANY, &error);
 +    if (!json || !json_is_true(json))
 +        fail("json_load decoded any failed - boolean");
 +    json_decref(json);
 +
 +    json = json_loads("null", JSON_DECODE_ANY, &error);
 +    if (!json || !json_is_null(json))
 +        fail("json_load decoded any failed - null");
 +    json_decref(json);
 +}
 +
+ static void load_wrong_args()
+ {
+     json_t *json;
+     json_error_t error;
+ 
+     json = json_loads(NULL, 0, &error);
+     if (json)
+         fail("json_loads should return NULL if the first argument is NULL");
+ 
+     json = json_loadb(NULL, 0, 0, &error);
+     if (json)
+         fail("json_loadb should return NULL if the first argument is NULL");
+ 
+     json = json_loadf(NULL, 0, &error);
+     if (json)
+         fail("json_loadf should return NULL if the first argument is NULL");
+ 
+     json = json_load_file(NULL, 0, &error);
+     if (json)
+         fail("json_loadf should return NULL if the first argument is NULL");
+ }
+ 
  static void run_tests()
  {
      file_not_found();
      reject_duplicates();
      disable_eof_check();
 +    decode_any();
+     load_wrong_args();
  }