@@ -1603,8 +1603,7 @@ int32_t cli_bcapi_json_get_object(struct cli_bc_ctx *ctx, const int8_t* name, in

     strncpy(namep, (char*)name, name_len);

     namep[name_len] = '\0';

-    jobj = json_object_object_get(jobj,namep);

-    if (!jobj) { /* object not found */

+    if (!json_object_object_get_ex(jobj, namep, &jobj)) { /* object not found */

         free(namep);

         return 0;

     }

@@ -700,7 +700,7 @@ ole2_walk_property_tree(ole2_header_t * hdr, const char *dir, int32_t prop_index

             if (dir) {

 #if HAVE_JSON

                 if ((ctx->options & CL_SCAN_FILE_PROPERTIES) && (ctx->wrkproperty != NULL)) {

-                    if (json_object_object_get(ctx->wrkproperty, "DigitalSignatures") == NULL) {

+                    if (!json_object_object_get_ex(ctx->wrkproperty, "DigitalSignatures", NULL)) {

                         name = get_property_name2(prop_block[idx].name, prop_block[idx].name_size);

                         if (name) {

                             if (!strcmp(name, "_xmlsignatures") || !strcmp(name, "_signatures")) {

@@ -894,8 +894,7 @@ handler_enum(ole2_header_t * hdr, property_t * prop, const char *dir, cli_ctx *

     name = get_property_name2(prop->name, prop->name_size);

     if (name) {

         if (ctx->options & CL_SCAN_FILE_PROPERTIES && ctx->wrkproperty != NULL) {

-            arrobj = json_object_object_get(ctx->wrkproperty, "Streams");

-            if (NULL == arrobj) {

+            if (!json_object_object_get_ex(ctx->wrkproperty, "Streams", &arrobj)) {

                 arrobj = json_object_new_array();

                 if (NULL == arrobj) {

                     cli_errmsg("ole2: no memory for streams list as json array\n");

@@ -234,8 +234,7 @@ static int ooxml_parse_element(xmlTextReaderPtr reader, json_object *wrkptr, int

         switch (node_type) {

         case XML_READER_TYPE_ELEMENT:

             if (!skip) {

-                njptr = json_object_object_get(wrkptr, element_tag);

-                if (!njptr) {

+                if (!json_object_object_get_ex(wrkptr, element_tag, &njptr)) {

                     njptr = json_object_new_object();

                     if (NULL == njptr) {

                         cli_errmsg("ooxml_basic_json: no memory for json object.\n");

@@ -282,8 +281,7 @@ static int ooxml_parse_element(xmlTextReaderPtr reader, json_object *wrkptr, int

         case XML_READER_TYPE_TEXT:

             if (!skip) {

                 node_value = xmlTextReaderConstValue(reader);

-                njptr = json_object_object_get(wrkptr, element_tag);

-                if (njptr) {

+                if (json_object_object_get_ex(wrkptr, element_tag, &njptr)) {

                     cli_warnmsg("ooxml_parse_element: json object [%s] already exists\n", element_tag);

                 }

@@ -392,8 +390,8 @@ static int ooxml_basic_json(int fd, cli_ctx *ctx, const char *key)

                 if (rlvl > 2) { /* 0 is root xml object */

                     int i;

                     for (i = 1; i < rlvl-1; ++i) {

-                        json_object *newptr = json_object_object_get(wrkptr, stack[i]);

-                        if (!newptr) {

+                        json_object *newptr;

+                        if (!json_object_object_get_ex(wrkptr, stack[i], &newptr)) {

                             newptr = json_object_new_object();

                             if (NULL == newptr) {

                                 cli_errmsg("ooxml_basic_json: no memory for json object.\n");

@@ -996,8 +996,7 @@ void cli_append_virus(cli_ctx * ctx, const char * virname)

 #if HAVE_JSON

     if (SCAN_PROPERTIES && ctx->wrkproperty) {

         json_object *arrobj, *virobj;

-        arrobj  = json_object_object_get(ctx->wrkproperty, "Viruses");

-        if (NULL == arrobj) {

+        if (!json_object_object_get_ex(ctx->wrkproperty, "Viruses", &arrobj)) {

             arrobj = json_object_new_array();

             if (NULL == arrobj) {

                 cli_errmsg("cli_append_virus: no memory for json virus array\n");

@@ -612,8 +612,7 @@ static struct json_object *get_pe_property(cli_ctx *ctx)

     if (!(ctx) || !(ctx->wrkproperty))

         return NULL;

-    pe = json_object_object_get(ctx->wrkproperty, "PE");

-    if (!(pe)) {

+    if (!json_object_object_get_ex(ctx->wrkproperty, "PE", &pe)) {

         pe = json_object_new_object();

         if (!(pe))

             return NULL;

@@ -634,8 +633,7 @@ static void pe_add_heuristic_property(cli_ctx *ctx, const char *key)

     if (!(pe))

         return;

-    heuristics = json_object_object_get(pe, "Heuristics");

-    if (!(heuristics)) {

+    if (!json_object_object_get_ex(pe, "Heuristics", &heuristics)) {

         heuristics = json_object_new_array();

         if (!(heuristics))

             return;

@@ -659,8 +657,7 @@ static struct json_object *get_section_json(cli_ctx *ctx)

     if (!(pe))

         return NULL;

-    section = json_object_object_get(pe, "Sections");

-    if (!(section)) {

+    if (!json_object_object_get_ex(pe, "Sections", &section)) {

         section = json_object_new_array();

         if (!(section))

             return NULL;

@@ -2601,8 +2601,7 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

         }

         else {

             parent_property = ctx->wrkproperty;

-            arrobj = json_object_object_get(parent_property, "ContainedObjects");

-            if (NULL == arrobj) {

+            if (!json_object_object_get_ex(parent_property, "ContainedObjects", &arrobj)) {

                 arrobj = json_object_new_array();

                 if (NULL == arrobj) {

                     cli_errmsg("magic_scandesc: no memory for json properties object\n");