From 0b0f167978e96a0e1c12cdbfad8ff3eb85b56575 Mon Sep 17 00:00:00 2001 From: johannes Date: Fri, 9 Feb 2024 21:11:29 +0100 Subject: readdemomap no longer read v6 magic for older versions --- src/demo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/demo.c b/src/demo.c index f5c346e..7c8bdbf 100644 --- a/src/demo.c +++ b/src/demo.c @@ -68,15 +68,17 @@ int readdemotimeline(FILE *fp, demotimeline *dt) int readdemomap(FILE *fp, demomap *dm, int mapsize, unsigned char ver) { - char magicbuf[sizeof(mapmagic)]; + if (ver >= 6) + { + char magicbuf[sizeof(mapmagic)]; - fread(magicbuf, 1, sizeof(mapmagic), fp); - if (memcmp(magicbuf, mapmagic, sizeof(mapmagic)) != 0) - return -1; + fread(magicbuf, 1, sizeof(mapmagic), fp); + if (memcmp(magicbuf, mapmagic, sizeof(mapmagic)) != 0) + return -1; - if (ver >= 4) if (fread(dm->sha256, 1, 32, fp) != 32) return -2; + } dm->data = (char *)malloc(mapsize); if (fread(dm->data, 1, mapsize, fp) != mapsize) @@ -585,7 +587,7 @@ void printdemo(demo *demo, char printchunks) break; case DEMODELTA: if (printchunks) - printdemodelta(chunk->data.delta); + printdemodelta(chunk->data.delta); typecount[(int)DEMODELTA]++; break; default: -- cgit v1.2.3