Avoiding Initial SegFault *now with lycopene!*

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5373 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index c9033b5a591f430c91aedc5cbc53a794d8bfeeb5..4e480b1476402b3536c5375bb0c0b68784205ee1 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -45,10 +45,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown);
 SWITCH_MODULE_DEFINITION(mod_spidermonkey, mod_spidermonkey_load, mod_spidermonkey_shutdown, NULL);
 
 #define METHOD_SANITY_CHECK() do {                                                                                             \
-if (jss->sanity_code != SANITY_CODE_VAL) {                                                             \
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Object! Avoiding Initial SegFault!\n"); \
-       return JS_TRUE;                                                                                                 \
- }                                                                                                                                             \
 if (!jss || !jss->session) {                                                                                   \
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You must call the session.originate method before calling this method!\n"); \
        *rval = BOOLEAN_TO_JSVAL(JS_FALSE);                                                                     \
@@ -84,7 +80,7 @@ static struct {
 
 static JSClass global_class = {
        "Global", JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
 };
 
@@ -299,7 +295,7 @@ static JSBool request_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval
 
 JSClass request_class = {
        "Request", JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, request_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, request_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, request_destroy, NULL, NULL, NULL, NULL
 };
 
@@ -604,7 +600,7 @@ static JSBool event_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval
 
 JSClass event_class = {
        "Event", JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, event_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, event_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, event_destroy, NULL, NULL, NULL,
        event_construct
 };
@@ -2040,6 +2036,7 @@ static JSPropertySpec session_props[] = {
        {0}
 };
 
+
 static JSBool session_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
 {
        struct js_session *jss = JS_GetPrivate(cx, obj);
@@ -2133,7 +2130,7 @@ static JSBool session_getProperty(JSContext * cx, JSObject * obj, jsval id, jsva
 
 JSClass session_class = {
        "Session", JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, session_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, session_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, session_destroy, NULL, NULL, NULL,
        session_construct
 };
@@ -2149,7 +2146,6 @@ static JSObject *new_js_session(JSContext * cx, JSObject * obj, switch_core_sess
                jss->cx = cx;
                jss->obj = session_obj;
                jss->stack_depth = 0;
-               jss->sanity_code = SANITY_CODE_VAL;
                if ((JS_SetPrivate(cx, session_obj, jss) &&
                         JS_DefineProperties(cx, session_obj, session_props) && JS_DefineFunctions(cx, session_obj, session_methods))) {
                        return session_obj;
@@ -2170,7 +2166,6 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsva
        memset(jss, 0, sizeof(*jss));
        jss->cx = cx;
        jss->obj = obj;
-       jss->sanity_code = SANITY_CODE_VAL;
        switch_set_flag(jss, S_FREE);
 
        JS_SetPrivate(cx, obj, jss);
@@ -2513,7 +2508,7 @@ static JSBool fileio_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval
 
 JSClass fileio_class = {
        "FileIO", JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, fileio_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, fileio_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, fileio_destroy, NULL, NULL, NULL,
        fileio_construct
 };

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
index daa7e78335dd718e34da29f69b47bd2715b25cd8..88a7f73ea36ebbc92c27456506c7cddbd92e0359 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
@@ -122,7 +122,6 @@ struct sm_module_interface {
 typedef struct sm_module_interface sm_module_interface_t;
 typedef switch_status_t (*spidermonkey_init_t) (const sm_module_interface_t ** module_interface);
 
-#define SANITY_CODE_VAL 424242
 struct js_session {
        switch_core_session_t *session;
        JSContext *cx;
@@ -132,9 +131,13 @@ struct js_session {
        JSFunction *on_hangup;
        int stack_depth;
        switch_channel_state_t hook_state;
-       int sanity_code;
 };
 
+JSBool DEFAULT_SET_PROPERTY(JSContext * cx, JSObject *obj, jsval id, jsval *vp)
+{
+       return JS_FALSE;
+}
+
 
 
 SWITCH_END_EXTERN_C

diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
index 03e97ea38495e05e86bb373c33eafa7e7c8d9132..57f344db639ea85a24a049730c0752a140f31f96 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
+++ b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
@@ -268,7 +268,7 @@ static JSBool db_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * v
 
 JSClass db_class = {
        modname, JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, db_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, db_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, db_destroy, NULL, NULL, NULL,
        db_construct
 };

diff --git a/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c b/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
index a250099fa3b37956cc8ba7379dd53fdd0999a4ad..2c38e576ea6af92266f3311c5d56b0774248b0bd 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
+++ b/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
@@ -216,7 +216,7 @@ static JSBool etpan_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval
 
 JSClass etpan_class = {
        modname, JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, etpan_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, etpan_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, etpan_destroy, NULL, NULL, NULL,
        etpan_construct
 };

diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
index 7dca90b582e4449e5c3b37f56d51fd0d71aa0d71..c4a92f322ea585fddb40a68689c6838997df7558 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
+++ b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
@@ -438,7 +438,7 @@ static JSBool odbc_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval *
 
 JSClass odbc_class = {
        modname, JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, odbc_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, odbc_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, odbc_destroy, NULL, NULL, NULL,
        odbc_construct
 };

diff --git a/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c b/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
index 5bc8f6e004b04cbdec8978b6a59ee70eba215351..0b7b8117ac9906097236a1a5f6745522b15fa7ec 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
+++ b/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
@@ -74,7 +74,7 @@ static JSBool skel_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval *
 
 JSClass skel_class = {
        modname, JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, skel_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, skel_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, skel_destroy, NULL, NULL, NULL,
        skel_construct
 };

diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
index ac38c42862e56f78652ab89b4dc841a05514a0b2..5fda95dafa97b753db42a98e40c50e072b21854a 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
+++ b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
@@ -331,7 +331,7 @@ static JSBool teletone_getProperty(JSContext * cx, JSObject * obj, jsval id, jsv
 
 JSClass teletone_class = {
        modname, JSCLASS_HAS_PRIVATE,
-       JS_PropertyStub, JS_PropertyStub, teletone_getProperty, JS_PropertyStub,
+       JS_PropertyStub, JS_PropertyStub, teletone_getProperty, DEFAULT_SET_PROPERTY,
        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, teletone_destroy, NULL, NULL, NULL,
        teletone_construct
 };