Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (14322 => 14323)

--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c	2009-07-22 20:37:20 UTC (rev 14322)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c	2009-07-22 20:47:52 UTC (rev 14323)
@@ -214,12 +214,15 @@
 		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;
+			}
 		}
 	}