Changeset 09ed91

Timestamp:

Jan 31, 2010, 2:41:10 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

961e9c

Parents:

1c7aed

git-author:

Frederik Heber <heber@…> (01/31/10 14:40:01)

git-committer:

Frederik Heber <heber@…> (01/31/10 14:41:10)

Message:

BUGFIX: NanoCreator - filename and stage were used in a very memory unsafe manner.

• filename and stage are not malloc'd to size of respective argument which are henceforth copied into.

File:

• util/src/NanoCreator.c (modified) (3 diffs)

util/src/NanoCreator.c

@@ -672 +672 @@
   double *x = NULL, *coord = NULL, *tempvector = NULL, *offset = NULL;
   //double *cog = NULL, *cog_projected = NULL;
-  char stage[6];
+  char *stage = NULL;
   int axis[NDIM] = {0,1,2}, chiral[2] = {1,1}, factors[NDIM] = {1,1,1};
   char name[255], line[255], input = 'n';
@@ -688 +688 @@
         } else {
                 // store variables
-                filename = argv[1];
-                strncpy(stage, argv[2], 5);
+                filename = Malloc(sizeof(char)*(strlen(argv[1])+1), "Main: filename");
+    stage = Malloc(sizeof(char)*(strlen(argv[2])+1), "Main: stage");
+                strcpy(filename, argv[1]);
+                strcpy(stage, argv[2]);
     fprintf(stdout, "I will begin at stage %s.\n", stage);
 
                 // build filenames
+    length = strlen(filename);
     char *ptr = strrchr(filename, '.');
     if (ptr == NULL) {
       ptr = filename;
     } else {
-      length = strlen(filename);
       if (ptr != NULL) {
         length = ((int)(ptr-filename) >= length-5) ? (int)(ptr-filename) : length;
@@ -1537 +1539 @@
   if (TubeBuffer != NULL) Free(TubeBuffer, "Main: end of stages - TubeBuffer");
 
-  Free(CellFilename, "Main: end of stafes - CellFilename");
-  Free(SheetFilename, "Main: end of stafes - CellFilename");
-  Free(TubeFilename, "Main: end of stafes - CellFilename");
-  Free(TorusFilename, "Main: end of stafes - CellFilename");
-  Free(SheetFilenameAligned, "Main: end of stafes - CellFilename");
-  Free(TubeFilenameAligned, "Main: end of stafes - CellFilename");
+  Free(CellFilename, "Main: end of stages - CellFilename");
+  Free(SheetFilename, "Main: end of stages - CellFilename");
+  Free(TubeFilename, "Main: end of stages - CellFilename");
+  Free(TorusFilename, "Main: end of stages - CellFilename");
+  Free(SheetFilenameAligned, "Main: end of stages - CellFilename");
+  Free(TubeFilenameAligned, "Main: end of stages - CellFilename");
+  Free(filename, "Main: end of stages - filename");
+  Free(stage, "Main: end of stages - stage");
 
   // exit