Nicolas Pitre nico at cam.org fix feroceon_bulk_write_memory() wrt uploaded code

[fw/openocd] / src / helper / jim.c

diff --git a/src/helper/jim.c b/src/helper/jim.c
index 800db23406762d1b5ee6516643db4bcc8fe2216c..a43bcbd621ad5279e8d9d2f6e24c363cadfa6202 100644 (file)
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -49,6 +49,7 @@
 #define JIM_DYNLIB      /* Dynamic library support for UNIX and WIN32 */
 #endif /* JIM_ANSIC */
 
+#define _GNU_SOURCE    /* for vasprintf() */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8695,7 +8696,7 @@ int Jim_EvalObj(Jim_Interp *interp, Jim_Obj *scriptObjPtr)
             if (cmd->cmdProc) {
                 interp->cmdPrivData = cmd->privData;
                 retcode = cmd->cmdProc(interp, argc, argv);
-                if (retcode == JIM_ERR_ADDSTACK) {
+                if ((retcode == JIM_ERR)||(retcode == JIM_ERR_ADDSTACK)) {
                     JimAppendStackTrace(interp, "", script->fileName, token[i-argc*2].linenr);
                     retcode = JIM_ERR;
                 }