Bump into issue with allocating pcx file buffer~ ><; but file reading is good but...

	modified:   scroll.exe
	modified:   src/lib/bitmap.c
	modified:   src/lib/mapread.c

diff --git a/scroll.exe b/scroll.exe
index d801e2e..8d5085d 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index ece5f07..e6a0adb 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -75,7 +75,7 @@ bitmapLoadPcx(char *filename) {
     bitmap_t result;\r
     long bufSize;\r
     int index;\r
-    byte count, val;\r
+    byte count, val;
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
@@ -85,11 +85,11 @@ bitmapLoadPcx(char *filename) {
     }\r
 \r
     /* load the first part of the pcx file */\r
-    loadPcxStage1(file, &result);\r
+    loadPcxStage1(file, &result);
 \r
     /* allocate the buffer */\r
-    bufSize = result.width * result.height;\r
-    result.data = malloc(bufSize);\r
+    bufSize = result.width * result.height;
+    result.data = malloc(bufSize);     //it breaks right here~
     if(!result.data) {\r
        printf("Could not allocate memory for bitmap data.");\r
        fclose(file);\r

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 6a947d6..cd4f5c3 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -164,14 +164,14 @@ again:
                        }
                } else {
                        //printf("================================================================================%s================================================================================", js);
-                       js_sv=malloc(sizeof(char)*10);
+                       //js_sv=malloc(sizeof(char)*10);
                        dump(js, tok, p.toknext, 0, map, 0);
                        eof_expected = 1;
                }
        }
 
-       //free(js);
-       //free(tok);
+       free(js);
+       free(tok);
        fclose(fh);
 
        return 0;