Changeset 1226

Timestamp:

14/04/09 16:16:26 (3 years ago)

Author:

Freddie Akeroyd

Message:

Fix possible NXdataset issue by adding 1 to allocated size to cover
string NULL termination. Refs #174.

Location:

branches/4.2

Files:

• applications/nxconvert_common.c (modified) (1 diff)
• src/nxdataset.c (modified) (2 diffs)

branches/4.2/applications/nxconvert_common.c

@@ -187 +187 @@
                 if (NXmalloc (&dataBuffer, dataRank, dataDimensions, dataType) != NX_OK) return NX_ERROR;
                 if (NXgetdata (inId, dataBuffer)  != NX_OK) return NX_ERROR;
-                if (dataType == NX_CHAR) {
-                   dataDimensions[0] = strlen((char*)dataBuffer)+1;
-                }
                 if (NXmakedata (outId, name, dataType, dataRank, dataDimensions) != NX_OK) return NX_ERROR;
                 if (NXopendata (outId, name) != NX_OK) return NX_ERROR;

branches/4.2/src/nxdataset.c

@@ -47 +47 @@
     length *= dim[i];
   }
-  pNew->u.ptr = malloc(length*getTypeSize(typecode));
+  /* add +1 in case of string NULL termination */
+  pNew->u.ptr = malloc(length*getTypeSize(typecode)+1);
 
   if(pNew->dim == NULL || pNew->u.ptr == NULL){
@@ -60 +61 @@
   }
   pNew->magic = MAGIC;
-  memset(pNew->u.ptr,0,length*getTypeSize(typecode));
+  /* add +1 in case of string NULL termination  - see above */
+  memset(pNew->u.ptr,0,length*getTypeSize(typecode)+1);
   return pNew;
 }