]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
add error checking on switch_core_db_column_text
authorMichael Jerris <mike@jerris.com>
Wed, 22 Jul 2009 20:47:52 +0000 (20:47 +0000)
committerMichael Jerris <mike@jerris.com>
Wed, 22 Jul 2009 20:47:52 +0000 (20:47 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14323 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c

index 5dbea1c106ab33d3ad380f00c4f162d17331f24d..568d18557e6c5dd211fdfcd842a97277d833f62a 100644 (file)
@@ -214,12 +214,15 @@ static JSBool db_fetch(JSContext * cx, JSObject * obj, uintN argc, jsval * argv,
                return JS_TRUE;
        }
        for (x = 0; x < colcount; x++) {
-               switch_snprintf(code, sizeof(code), "~_dB_RoW_DaTa_[\"%s\"] = \"%s\"",
-                                               (char *) switch_core_db_column_name(dbo->stmt, x), (char *) switch_core_db_column_text(dbo->stmt, x));
-
-               eval_some_js(code, dbo->cx, dbo->obj, rval);
-               if (*rval == JS_FALSE) {
-                       return JS_TRUE;
+               const char *var = (char *) switch_core_db_column_name(dbo->stmt, x);
+               const char *val = (char *) switch_core_db_column_text(dbo->stmt, x);
+               
+               if (var && val) {
+                       switch_snprintf(code, sizeof(code), "~_dB_RoW_DaTa_[\"%s\"] = \"%s\"", var, val);
+                       eval_some_js(code, dbo->cx, dbo->obj, rval);
+                       if (*rval == JS_FALSE) {
+                               return JS_TRUE;
+                       }
                }
        }