f0014

adesutherland · Jul 15, 2020 · 562d5af · 562d5af
1 parent 6e8f8c5
commit 562d5af
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 35 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 BREXX CMS Change LOG
 ====================
 
+F0014 - Fix Memory leak on error in X2C
 F0013 - Possibility to turn on debug and turn off optimser
 
 CMS-0.9.4 - 10 May 2020

diff --git a/config.h b/config.h
@@ -2,7 +2,7 @@
 
 /* The one version to rule them all! */
 /* #define CMS_VERSION "CMS-0.9.4" */
-#define CMS_VERSION "CMS-F0013"
+#define CMS_VERSION "CMS-F0014"
 /* #define __DEBUG__ */
 
 #include "rxmvs.h"

diff --git a/cp2vm370.bat b/cp2vm370.bat
@@ -1,6 +1,11 @@
 REM Copy and build source files to VM370
 REM This tests the cmsbuild.sh and cmsinstall.sh scripts
 REM that are used by the automated build process
+
+docker kill vm370
+docker run --rm -d -p 3270:3270 -p 8038:8038 -p 3505:3505 --name vm370 adriansutherland/vm370:latest
+REM docker run --rm -d -p 3270:3270 -p 8038:8038 -p 3505:3505 --name vm370 adriansutherland/vm370x:latest
+
 yata -c -f tmp.txt
 echo USERID  CMSUSER > yata.txt
 echo :READ  YATA     TXT      >> yata.txt

diff --git a/stack.c b/stack.c
@@ -1,35 +1,5 @@
 /* Modified for VM/370 CMS and GCC by Robert O'Hara, July 2010. */
-/*
- * $Id: stack.c,v 1.9 2009/02/02 09:26:23 bnv Exp $
- * $Log: stack.c,v $
- * Revision 1.9  2009/02/02 09:26:23  bnv
- * Modifications for CMS,MVS
- *
- * Revision 1.8  2008/07/15 07:40:25  bnv
- * #include changed from <> to ""
- *
- * Revision 1.7  2008/07/14 13:08:42  bnv
- * MVS,CMS support
- *
- * Revision 1.6  2004/04/30 15:27:50  bnv
- * Removed bmem.h
- *
- * Revision 1.5  2003/10/30 13:16:28  bnv
- * Variable name change
- *
- * Revision 1.4  2002/06/11 12:37:38  bnv
- * Added: CDECL
- *
- * Revision 1.3  2001/06/25 18:51:48  bnv
- * Header -> Id
- *
- * Revision 1.2  1999/11/26 13:13:47  bnv
- * Changed: To use the new macros.
- *
- * Revision 1.1  1998/07/02 17:34:50  bnv
- * Initial revision
- *
- */
+/* NOTE: Not certain if these funtions are used. AS             */
 
 #define __STACK_C__
 
@@ -102,8 +72,7 @@ PullFromStack( )
 PLstr str;
 
 Lfx(str, 131);
-CMSconsoleRead(str);
-printf("Stack: pulling [%s].\n", str);
+CMSconsoleRead(LSTR(*str));
 return str;
 #else
  DQueue *stck;

diff --git a/x2c.c b/x2c.c
@@ -45,8 +45,10 @@ Lx2c( const PLstr to, const PLstr from )
   for (j=i; ISXDIGIT(f[j]) && (j<LLEN(*from)); j++) ;; /* find hexdigits */
 
   if ((i<LLEN(*from)) && (j==i)) { /* Ooops wrong character */
+   LZEROSTR(*to);  /* Free memory */
+   LFREESTR(*to);
    Lerror(ERR_INVALID_HEX_CONST,0);
-   LZEROSTR(*to);  /* return null when error occures */
+   /* Lerror does not return */
    return;
   }