Merged changes from 3.15 branch, to revno 12807

2017-02-01 11:57:04 -06:00
parent a7f0525ac7 de698f370a
commit e95fcb2e06
90 changed files with 1401 additions and 959 deletions
--- a/src/libCom/iocsh/iocsh.cpp
+++ b/src/libCom/iocsh/iocsh.cpp
@@ -559,6 +559,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
    
    if (macros) {
        if (macParseDefns(NULL, macros, &defines) < 0) {
+            free(redirects);
            return -1;
        }
    }
@@ -571,6 +572,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
    if (handle == NULL) {
        if (macCreateHandle(&handle, pairs)) {
            errlogMessage("iocsh: macCreateHandle failed.");
+            free(redirects);
            return -1;
        }