fix crash when toscaIntrConnectHandler is called from iocsh without arguments

dirk-zimoch · dirk-zimoch · commit f7b1bc9a8c2b · 2018-04-13T11:49:50.000+02:00
diff --git a/toscaIocsh.c b/toscaIocsh.c
@@ -592,7 +592,6 @@ static void toscaIntrConnectHandlerFunc(const iocshArgBuf *args)
 {
     intrmask_t mask = toscaStrToIntrMask(args[0].sval);
     void (*function)() = symbolAddr(args[1].sval);
-    void* arg = args[2].sval ? strdup(args[2].sval) : strdup(args[0].sval);
     
     if (!args[0].sval)
     {
@@ -610,7 +609,9 @@ static void toscaIntrConnectHandlerFunc(const iocshArgBuf *args)
         fprintf(stderr, "Invalid function \"%s\"\n", args[1].sval);
         return;
     }
-    if (toscaIntrConnectHandler(mask, function, arg) != 0) fprintf(stderr, "%m\n");
+    if (toscaIntrConnectHandler(mask, function, 
+        strdup(args[2].sval ? args[2].sval : args[0].sval)) != 0)
+        fprintf(stderr, "%m\n");
 }
 
 static const iocshFuncDef toscaIntrDisconnectHandlerDef =

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,6 @@ static void toscaIntrConnectHandlerFunc(const iocshArgBuf *args)`
`592`	`592`	`{`
`593`	`593`	`intrmask_t mask = toscaStrToIntrMask(args[0].sval);`
`594`	`594`	`void (*function)() = symbolAddr(args[1].sval);`
`595`		`- void* arg = args[2].sval ? strdup(args[2].sval) : strdup(args[0].sval);`
`596`	`595`
`597`	`596`	`if (!args[0].sval)`
`598`	`597`	`{`
`@@ -610,7 +609,9 @@ static void toscaIntrConnectHandlerFunc(const iocshArgBuf *args)`
`610`	`609`	`fprintf(stderr, "Invalid function \"%s\"\n", args[1].sval);`
`611`	`610`	`return;`
`612`	`611`	`}`
`613`		`- if (toscaIntrConnectHandler(mask, function, arg) != 0) fprintf(stderr, "%m\n");`
	`612`	`+ if (toscaIntrConnectHandler(mask, function,`
	`613`	`+ strdup(args[2].sval ? args[2].sval : args[0].sval)) != 0)`
	`614`	`+ fprintf(stderr, "%m\n");`
`614`	`615`	`}`
`615`	`616`
`616`	`617`	`static const iocshFuncDef toscaIntrDisconnectHandlerDef =`