Merge pull request #389 from zowe/bugfix/dynalloc64_0c4

Fixed an inconsistent use of pointers in 64 bit case in dataset creation
zowe · Jul 28, 2023 · b186413 · b186413
2 parents 44bc925 + 6734a60
commit b186413
Show file tree

Hide file tree

Showing 3 changed files with 516 additions and 4 deletions.
diff --git a/c/dynalloc.c b/c/dynalloc.c
@@ -874,30 +874,32 @@ int setTextUnit(int type, int size, char* stringValue, int numValue, int key,
   }
 }
 
+typedef TextUnit *__ptr32 *__ptr32 TextUnitPtrArray;
+
 int dynallocNewDataset(TextUnit **inputTextUnit, int inputTextUnitCount, int *reasonCode) {
   ALLOC_STRUCT31(
     STRUCT31_NAME(below2G),
     STRUCT31_FIELDS(
       DynallocParms parms;
-      TextUnit ** __ptr32 textUnits;
+      TextUnitPtrArray textUnits;
     )
   );
 
-  below2G->textUnits = (TextUnit **)safeMalloc31(sizeof(TextUnit*) * inputTextUnitCount, "Text units array");
+  below2G->textUnits = (TextUnitPtrArray)safeMalloc31(sizeof(TextUnit*__ptr32) * inputTextUnitCount, "Text units array");
   if(below2G->textUnits == NULL) {
     return -1;
   }
   DynallocParms *parms = &below2G->parms;
   dynallocParmsInit(parms);
 
-  dynallocParmsSetTextUnits(parms, (TextUnit * __ptr32 *)below2G->textUnits, inputTextUnitCount);
+  dynallocParmsSetTextUnits(parms, (TextUnitPtrArray)below2G->textUnits, inputTextUnitCount);
 
   int rc;
 
   do {
     rc = 0;
     for (int i = 0; i < inputTextUnitCount; i++) { 
-      below2G->textUnits[i] = inputTextUnit[i];
+      below2G->textUnits[i] = (TextUnit *__ptr32)inputTextUnit[i];
       if (below2G->textUnits[i] == NULL) {
         rc = -1;
         break;

diff --git a/tests/create1.json b/tests/create1.json
@@ -0,0 +1,11 @@
+{"ndisp":"CATALOG",
+ "status":"NEW",
+ "space":"TRK",
+ "dsorg":"PO",
+ "lrecl":80,
+ "recfm":"FB",
+  "dir":20,
+  "prime":3,
+  "secnd":3,
+  "dsnt":"PDS",
+  "close":"true"}