Changeset 1234

Timestamp:

15/04/09 10:39:54 (3 years ago)

Author:

Freddie Akeroyd

Message:

Merge back changes from 4.2 branch (add space for NULL termination)
Probably not needed now (issue #174 was properly fixed in r1232),
but no harm done. Refs #174.

Location:

trunk

Files:

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

trunk/applications/nxconvert_common.c

@@ -94 +94 @@
       return NX_ERROR;
    }
-   
+
 /* Output global attributes */
    if (WriteAttributes (nx_is_definition) != NX_OK)
@@ -105 +105 @@
         return NX_ERROR;
    }
-/* clos einput */
+/* close input */
    if (NXclose (&inId) != NX_OK)
    {

trunk/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;
 }