]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
follow commit 0bec209a, we should still allow NULL arg
authorSeven Du <dujinfang@gmail.com>
Thu, 8 Jan 2015 03:38:53 +0000 (11:38 +0800)
committerSeven Du <dujinfang@gmail.com>
Thu, 8 Jan 2015 03:40:22 +0000 (11:40 +0800)
src/mod/endpoints/mod_verto/mod_verto.c

index 55411371c61632642412dfe8a2c1f5e4bc0be936..08f4a5095c6ac034e8b63dcdbc8313d43239abca 100644 (file)
@@ -3583,15 +3583,14 @@ static switch_bool_t jsapi_func(const char *method, cJSON *params, jsock_t *jsoc
 
                                if (jsock->allowed_fsapi && !strcmp(function, "fsapi")) {
                                        cJSON *data = cJSON_GetObjectItem(params, "data");
-                                       cJSON *cmd;
-                                       cJSON *arg;
-
-                                       if (data &&
-                                               (cmd = cJSON_GetObjectItem(data, "cmd")) &&
-                                               (arg = cJSON_GetObjectItem(data, "arg")) &&
-                                               cmd->type == cJSON_String && cmd->valuestring &&
-                                               !auth_api_command(jsock, cmd->valuestring, arg ? arg->valuestring : NULL)) {
-                                               return SWITCH_FALSE;
+                                       if (data) {
+                                               cJSON *cmd = cJSON_GetObjectItem(data, "cmd");
+                                               cJSON *arg = cJSON_GetObjectItem(data, "arg");
+
+                                               if (cmd  && cmd->type == cJSON_String && cmd->valuestring &&
+                                                       !auth_api_command(jsock, cmd->valuestring, arg ? arg->valuestring : NULL)) {
+                                                       return SWITCH_FALSE;
+                                               }
                                        }
                                }
                        }