shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

Merge pull request #737 from aaaaaa123456789/master

Fix an uninitialized read bug in lzcomp

--- a/gfx/lz.mk

+++ b/gfx/lz.mk

@@ -34,7 +34,12 @@

 gfx/pokegear/pokegear_sprites.2bpp.lz: LZFLAGS += --align 4

 gfx/pokegear/town_map.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1

+gfx/pokemon/corsola/front.animated.2bpp.lz: LZFLAGS += --method 4

 gfx/pokemon/hitmontop/back.2bpp.lz: LZFLAGS += --method 4

+gfx/pokemon/nidoran_f/front.animated.2bpp.lz: LZFLAGS += --method 4

+gfx/pokemon/primeape/front.animated.2bpp.lz: LZFLAGS += --method 4

+gfx/pokemon/scyther/front.animated.2bpp.lz: LZFLAGS += --method 4

+gfx/pokemon/unown_g/front.animated.2bpp.lz: LZFLAGS += --method 4

 gfx/pokemon/voltorb/front.animated.2bpp.lz: LZFLAGS += --method 4

 gfx/sgb/gbc_only.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1

@@ -56,6 +61,7 @@

 gfx/tilesets/mansion.2bpp.lz: LZFLAGS += --method 2 --align 4

 gfx/tilesets/mart.2bpp.lz: LZFLAGS += --method 2 --align 4

 gfx/tilesets/omanyte_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1

+gfx/tilesets/players_room.2bpp.lz: LZFLAGS += --method 4 --align 4

 gfx/tilesets/ruins_of_alph.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1

 gfx/tilesets/tower.2bpp.lz: LZFLAGS += --method 2 --align 4

--- a/tools/lz/mpcomp.c

+++ b/tools/lz/mpcomp.c

@@ -101,7 +101,7 @@

       current = buffer + refpos - (length - 3);

     else

       current = reference + refpos;

-    if (memcmp(data + position, current, 4)) continue;

+    if (memcmp(data + position, current, ((position + 4) > length) ? length - position : 4)) continue;

     for (count = 4; (count < (length - position)) && (count < (length - refpos)); count ++) if (data[position + count] != current[count]) break;

     if (count > (length - refpos)) count = length - refpos;

     if (count > (length - position)) count = length - position;

--- a/tools/lz/output.c

+++ b/tools/lz/output.c

@@ -28,8 +28,16 @@

   if (fputs("\tlzend\n", fp) < 0) error_exit(1, "could not write terminator to compressed output");

   if (padding_size) {

     input_stream += padding_offset;

-    int rv = fprintf(fp, "\tdb $%02hhx", *(input_stream ++));

-    while ((rv >= 0) && (-- padding_size)) rv = fprintf(fp, ", $%02hhx", *(input_stream ++));

+    int rv = 0;

+    unsigned pos;

+    const char * prefix = "\tdb";

+    for (pos = 0; (rv >= 0) && (pos < padding_size); pos ++) {

+      if (input_stream[pos])

+        rv = fprintf(fp, "%s $%02hhx", prefix, input_stream[pos]);

+      else

+        rv = fprintf(fp, "%s 0", prefix);

+      prefix = ",";

+    }

     if (rv >= 0) rv = -(putc('\n', fp) == EOF);

     if (rv < 0) error_exit(1, "could not write padding to compressed output");

   }

--- a/tools/lz/uncomp.c

+++ b/tools/lz/uncomp.c

@@ -49,7 +49,7 @@

   }

   if (slack) *slack = *size - (rp - data);

   *size = current - result;

-  return realloc(result, *size * sizeof(struct command));

+  return realloc(result, (*size ? *size : 1) * sizeof(struct command));

   error:

   free(result);

   return NULL;

@@ -88,5 +88,5 @@

     }

   }

   *size = current - result;

-  return result;

+  return realloc(result, *size ? *size : 1);

 }