Skip to content
Snippets Groups Projects
Commit 4a68cdc3 authored by rswindell's avatar rswindell
Browse files

Report msgbase object related errors that cause the script to terminate.

parent bf682d51
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 3 deletions
src/sbbs3/js_bbs.cpp
+ 12
− 3
View file @ 4a68cdc3
...@@ -2654,8 +2654,10 @@ js_email(JSContext *cx, uintN argc, jsval *arglist) ...@@ -2654,8 +2654,10 @@ js_email(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj = JSVAL_TO_OBJECT(argv[i])) == NULL) if((hdrobj = JSVAL_TO_OBJECT(argv[i])) == NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) {
if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) {
JS_ReportError(cx, "msg hdr object cannot be parsed");
return JS_FALSE; return JS_FALSE;
}
remsg = &msg; remsg = &msg;
} }
} }
...@@ -2725,8 +2727,10 @@ js_netmail(JSContext *cx, uintN argc, jsval *arglist) ...@@ -2725,8 +2727,10 @@ js_netmail(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj = JSVAL_TO_OBJECT(argv[i])) == NULL) if((hdrobj = JSVAL_TO_OBJECT(argv[i])) == NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) {
if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) {
JS_ReportError(cx, "msg hdr object cannot be parsed");
return JS_FALSE; return JS_FALSE;
}
remsg = &msg; remsg = &msg;
} }
} }
...@@ -3553,8 +3557,10 @@ js_post_msg(JSContext *cx, uintN argc, jsval *arglist) ...@@ -3553,8 +3557,10 @@ js_post_msg(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL) if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &resmb, &remsg, /* post: */NULL)) {
if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) if(!js_ParseMsgHeaderObject(cx, hdrobj, &msg)) {
JS_ReportError(cx, "msg hdr object cannot be parsed");
return JS_FALSE; return JS_FALSE;
}
remsg = &msg; remsg = &msg;
} }
} }
...@@ -3595,6 +3601,7 @@ js_show_msg(JSContext *cx, uintN argc, jsval *arglist) ...@@ -3595,6 +3601,7 @@ js_show_msg(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL) if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, &post)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, &post)) {
JS_ReportError(cx, "msg hdr object lacks privates");
return JS_FALSE; return JS_FALSE;
} }
} }
...@@ -3633,6 +3640,7 @@ js_show_msg_header(JSContext *cx, uintN argc, jsval *arglist) ...@@ -3633,6 +3640,7 @@ js_show_msg_header(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL) if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, NULL)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, NULL)) {
JS_ReportError(cx, "msg hdr object lacks privates");
return JS_FALSE; return JS_FALSE;
} }
} else if(JSVAL_IS_STRING(argv[n])) { } else if(JSVAL_IS_STRING(argv[n])) {
...@@ -3681,6 +3689,7 @@ js_download_msg_attachments(JSContext *cx, uintN argc, jsval *arglist) ...@@ -3681,6 +3689,7 @@ js_download_msg_attachments(JSContext *cx, uintN argc, jsval *arglist)
if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL) if((hdrobj=JSVAL_TO_OBJECT(argv[n]))==NULL)
return JS_FALSE; return JS_FALSE;
if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, NULL)) { if(!js_GetMsgHeaderObjectPrivates(cx, hdrobj, &smb, &msg, NULL)) {
JS_ReportError(cx, "msg hdr object lacks privates");
return JS_FALSE; return JS_FALSE;
} }
} else if(JSVAL_IS_BOOLEAN(argv[n])) { } else if(JSVAL_IS_BOOLEAN(argv[n])) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment