diff options
| author | hemagx <hemagx2@gmail.com> | 2016-03-01 08:16:37 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-07-12 20:58:44 +0200 |
| commit | d0358265beff02fd9c094ba480f1a9583035cf64 (patch) | |
| tree | 6c8433dfda39ba19a721e66f70b0f11fce45eeeb /src/map/clif.c | |
| parent | b0a4a441f582810c91aeec458fdbe7cc6cc78db9 (diff) | |
| download | hercules-d0358265beff02fd9c094ba480f1a9583035cf64.tar.gz hercules-d0358265beff02fd9c094ba480f1a9583035cf64.tar.bz2 hercules-d0358265beff02fd9c094ba480f1a9583035cf64.tar.xz hercules-d0358265beff02fd9c094ba480f1a9583035cf64.zip | |
Interface grfio.c
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9619a7201..3069e95ad 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -12878,7 +12878,8 @@ bool clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) { int header = 0, bitmap = 0, offbits = 0, palettesize = 0; nullpo_retr(false, emblem); - if( decode_zip(buf, &buf_len, emblem, emblem_len) != 0 || buf_len < BITMAPFILEHEADER_SIZE + BITMAPINFOHEADER_SIZE + if (grfio->decode_zip(buf, &buf_len, emblem, emblem_len) != 0 + || buf_len < BITMAPFILEHEADER_SIZE + BITMAPINFOHEADER_SIZE || RBUFW(buf,0) != 0x4d42 // BITMAPFILEHEADER.bfType (signature) || RBUFL(buf,2) != buf_len // BITMAPFILEHEADER.bfSize (file size) || RBUFL(buf,14) != BITMAPINFOHEADER_SIZE // BITMAPINFOHEADER.biSize (other headers are not supported) |