]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
let session.sayPhrase method take a blank language string
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 21 Aug 2007 19:00:06 +0000 (19:00 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 21 Aug 2007 19:00:06 +0000 (19:00 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5653 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/languages/mod_spidermonkey/mod_spidermonkey.c

index 160831b0d203b22d6f94c0c68af56c6040e468cc..b3b3fadc027d6e3996ff937c61f831aa54eb690e 100644 (file)
@@ -1242,6 +1242,7 @@ static JSBool session_sayphrase(JSContext * cx, JSObject * obj, uintN argc, jsva
        char *phrase_name = NULL;
        char *phrase_data = NULL;
        char *phrase_lang = NULL;
+       char *tmp = NULL;
        //char *input_callback = NULL;
        void *bp = NULL;
        int len = 0;
@@ -1268,11 +1269,20 @@ static JSBool session_sayphrase(JSContext * cx, JSObject * obj, uintN argc, jsva
 
 
        if (argc > 1) {
-               phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
+               tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
+               if (!switch_strlen_zero(tmp)) {
+                       phrase_data = tmp;
+               } else {
+                       *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+                       return JS_TRUE;
+               }
        }
 
        if (argc > 2) {
-               phrase_lang = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
+               tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
+               if (!switch_strlen_zero(tmp)) {
+                       phrase_lang = tmp;
+               }
        }
 
        if (argc > 3) {