Changeset 27 for rxprtutl

Timestamp:

Aug 2, 2015, 3:52:53 AM (10 years ago)

Author:

Alex Taylor

Message:

Fixed memory leak in writing of compound variables; removed erroneous DosFreeMem from SaveResultString.

File:

• rxprtutl/trunk/rxprtutl.c (modified) (3 diffs)

rxprtutl/trunk/rxprtutl.c

@@ -2039 +2039 @@
             return ( FALSE );
         }
-        DosFreeMem( prsResult->strptr );
         prsResult->strptr = pchNew;
     }
@@ -2068 +2067 @@
     ULONG    ulRc,
              ulBytes;
-    CHAR     szCompoundName[ US_COMPOUND_MAXZ ],
-            *pchValue;
+    CHAR     szCompoundName[ US_COMPOUND_MAXZ ];
 
     sprintf( szCompoundName, "%s.%d", pszStem, ulIndex );
     if ( pszValue == NULL ) {
-        pchValue = "";
+        pszValue = "";
         ulBytes  = 0;
     } else {
         ulBytes = strlen( pszValue );
-        ulRc = DosAllocMem( (PVOID) &pchValue, ulBytes + 1, PAG_WRITE | PAG_COMMIT );
-        if ( ulRc != 0 ) {
-            WriteErrorCode( ulRc, "DosAllocMem");
-            return FALSE;
-        }
-        memcpy( pchValue, pszValue, ulBytes );
     }
     MAKERXSTRING( shvVar.shvname, szCompoundName, strlen(szCompoundName) );
-    shvVar.shvvalue.strptr    = pchValue;
+    shvVar.shvvalue.strptr    = pszValue;
     shvVar.shvvalue.strlength = ulBytes;
     shvVar.shvnamelen  = RXSTRLEN( shvVar.shvname );
@@ -2120 +2112 @@
     ULONG    ulRc,
              ulBytes;
-    CHAR     szCompoundName[ US_COMPOUND_MAXZ ],
-            *pchValue;
+    CHAR     szCompoundName[ US_COMPOUND_MAXZ ];
 
     sprintf( szCompoundName, "%s.%s", pszStem, pszTail );
     if ( pszValue == NULL ) {
-        pchValue = "";
+        pszValue = "";
         ulBytes  = 0;
     } else {
         ulBytes = strlen( pszValue );
-        ulRc = DosAllocMem( (PVOID) &pchValue, ulBytes + 1, PAG_WRITE | PAG_COMMIT );
-        if ( ulRc != 0 ) {
-            WriteErrorCode( ulRc, "DosAllocMem");
-            return FALSE;
-        }
-        memcpy( pchValue, pszValue, ulBytes );
     }
     MAKERXSTRING( shvVar.shvname, szCompoundName, strlen(szCompoundName) );
-    shvVar.shvvalue.strptr    = pchValue;
+    shvVar.shvvalue.strptr    = pszValue;
     shvVar.shvvalue.strlength = ulBytes;
     shvVar.shvnamelen  = RXSTRLEN( shvVar.shvname );