diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-01-19 23:55:54 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:33:22 (GMT) |
| commit | f0730818e4f8f0e2b96886cb340d5705f8d7dd92 (patch) | |
| tree | bc3f532b9e8691ecb954cfbe253d89ccd6094fbe /src | |
| parent | 4af8385a0ee0dcf8c29e322f994c66308da53c9c (diff) | |
| download | powder-f0730818e4f8f0e2b96886cb340d5705f8d7dd92.zip powder-f0730818e4f8f0e2b96886cb340d5705f8d7dd92.tar.gz | |
OPS thumbnail crash fix, and blank thumbnails for saves from a newer version
Diffstat (limited to 'src')
| -rw-r--r-- | src/interface.c | 8 | ||||
| -rw-r--r-- | src/save.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/interface.c b/src/interface.c index 50d26c9..e027506 100644 --- a/src/interface.c +++ b/src/interface.c @@ -6276,13 +6276,13 @@ void catalogue_ui(pixel * vid_buf) csave->image = resample_img(tmpimage, imgwidth, imgheight, XRES/CATALOGUE_S, YRES/CATALOGUE_S); free(tmpimage); } else { - //Blank image, this should default to something else - csave->image = malloc((XRES/CATALOGUE_S)*(YRES/CATALOGUE_S)*PIXELSIZE); + //Blank image, TODO: this should default to something else + csave->image = calloc((XRES/CATALOGUE_S)*(YRES/CATALOGUE_S), PIXELSIZE); } free(data); } else { - //Blank image, this should default to something else - csave->image = malloc((XRES/CATALOGUE_S)*(YRES/CATALOGUE_S)*PIXELSIZE); + //Blank image, TODO: this should default to something else + csave->image = calloc((XRES/CATALOGUE_S)*(YRES/CATALOGUE_S), PIXELSIZE); } imageoncycle = 1; } @@ -58,6 +58,7 @@ pixel *prerender_save_OPS(void *save, int size, int *width, int *height) int inputDataLen = size, bsonDataLen = 0, partsDataLen, partsPosDataLen, wallDataLen; int i, x, y, j; int blockX, blockY, blockW, blockH, fullX, fullY, fullW, fullH; + int bsonInitialised = 0; pixel * vidBuf = NULL; bson b; bson_iterator iter; @@ -121,6 +122,7 @@ pixel *prerender_save_OPS(void *save, int size, int *width, int *height) } bson_init_data(&b, bsonData); + bsonInitialised = 1; bson_iterator_init(&iter, &b); while(bson_iterator_next(&iter)) { @@ -301,7 +303,9 @@ fail: vidBuf = NULL; } fin: - bson_destroy(&b); + //Don't call bson_destroy if bson_init wasn't called, or an uninitialised pointer (b.data) will be freed and the game will crash + if (bsonInitialised) + bson_destroy(&b); return vidBuf; } |