@@ -791,6 +791,19 @@ int scanmanager(const struct optstruct *opts)

         }

     }

+    /* JSON check to prevent engine loading if specified without libjson-c  */

+#if HAVE_JSON

+    if (optget(opts, "gen-json")->enabled)

+        options |= CL_SCAN_FILE_PROPERTIES;

+#else

+    if (optget(opts, "gen-json")->enabled) {

+        logg("!Can't generate json (gen-json). libjson-c dev library was missing or misconfigured when ClamAV was built.\n")

+

+        cl_engine_free(engine);

+        return 2;

+    }

+#endif

+

     if((opt = optget(opts, "tempdir"))->enabled) {

         if((ret = cl_engine_set_str(engine, CL_ENGINE_TMPDIR, opt->strarg))) {

             logg("!cli_engine_set_str(CL_ENGINE_TMPDIR) failed: %s\n", cl_strerror(ret));

@@ -1114,11 +1127,6 @@ int scanmanager(const struct optstruct *opts)

         procdev = sb.st_dev;

 #endif

-#if HAVE_JSON

-    if (optget(opts, "gen-json")->enabled)

-        options |= CL_SCAN_FILE_PROPERTIES;

-#endif

-

     /* check filetype */

     if(!opts->filename && !optget(opts, "file-list")->enabled) {

         /* we need full path for some reasons (eg. archive handling) */