refactoring

* some edits to the memory allocation logic
* calling exceptions is completely excluded

extension.cpp

@@ -42,8 +42,6 @@ bool CJanssonExtension::SDK_OnLoad(char *error, size_t maxlength, bool late)
         return false;
     }
 
-    smutils->LogMessage(myself, "Add type: done");
-
 	return sharesys->AddInterface(myself, pJansson);
 }
 
@@ -59,5 +57,5 @@ void CJanssonExtension::SDK_OnAllLoaded() {
 }
 
 void CJsonHandler::OnHandleDestroy(SourceMod::HandleType_t type, void *object) {
-    delete (nJansson::Json*) object;
+    pJansson->close(static_cast<nJansson::IJson *>(object));
 }

smsdk_config.h

@@ -30,7 +30,7 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Jansson-re"
 #define SMEXT_CONF_DESCRIPTION	"Provides JSON natives for plugins"
-#define SMEXT_CONF_VERSION		"1.6.0"
+#define SMEXT_CONF_VERSION		"1.6.1"
 #define SMEXT_CONF_AUTHOR		"rej.chev"
 #define SMEXT_CONF_URL			"https://discord.gg/cFZ97Mzrjy"
 #define SMEXT_CONF_LOGTAG		"Json"

src/jansson.cpp

@@ -4,11 +4,18 @@ using namespace nJansson;
 
 IJson *Jansson::create(const char *str, const size_t& flags)
 {
+    // because [] & {} len = 2
+    if(str == nullptr || strlen(str) < 2)
+        return nullptr;
+
     return new Json(str, flags);
 }
 
 IJson *Jansson::create(FILE *input, const size_t &flags)
 {
+    if(input == nullptr)
+        return nullptr;
+
     return new Json(input, flags);
 }
 

src/json.cpp

@@ -131,11 +131,21 @@ const char* Json::get()
 }
 
 IJson *Json::get(const char *key) const {
-    return new Json(get_t(key), JSON_ERROR_NULL, true);
+    json_t* pointer;
+
+    if((pointer = get_t(key)) == nullptr)
+        return nullptr;
+
+    return new Json(pointer, JSON_ERROR_NULL, true);
 }
 
 IJson *Json::get(const size_t &index) const {
-    return new Json(get_t(index), JSON_ERROR_NULL, true);
+    json_t* pointer;
+
+    if((pointer = get_t(index)) == nullptr)
+        return nullptr;
+
+    return new Json(pointer, JSON_ERROR_NULL, true);
 }
 
 bool Json::set(const char *key, const IJson *value) {
@@ -241,7 +251,12 @@ bool Json::extend(const IJsonArray *another) {
 }
 
 JsonType Json::type(const char *key) const {
-    return Json(get_t(key), JSON_ERROR_NULL).type();
+    json_t* pointer;
+
+    if((pointer = get_t(key)) == nullptr)
+        return jtInvalid;
+
+    return Json(pointer, JSON_ERROR_NULL).type();
 }
 
 json_t *Json::get_t(const char *key) const {
@@ -253,7 +268,12 @@ json_t *Json::get_t(const size_t &index) const {
 }
 
 JsonType Json::type(const size_t &index) const {
-    return Json(get_t(index), JSON_ERROR_NULL).type();
+    json_t* pointer;
+
+    if((pointer = get_t(index)) == nullptr)
+        return jtInvalid;
+
+    return Json(pointer, JSON_ERROR_NULL).type();
 }
 
 bool Json::exist(const char *key) const {