diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2023-04-21 13:01:34 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2023-04-21 13:01:34 +0000 |
| commit | 9bd48f0dbd64fb94dc2b5b05238fde0bfdd4ff3f (patch) | |
| tree | f813bef57473ae44078dab79f0e4cf4027f77132 | |
| parent | 17adf4308cc90d1263774d0a120af65a5fc147fa (diff) | |
| parent | 8c0859a80444c90b8dfb862a9f16de74e16f0a9e (diff) | |
| download | libtiff-git-9bd48f0dbd64fb94dc2b5b05238fde0bfdd4ff3f.tar.gz | |
Merge branch 'mymaster1' into 'master'
fix runtime error: applying zero offset to null pointer
See merge request libtiff/libtiff!479
| -rw-r--r-- | libtiff/tif_dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 3d57341f..c3a7a418 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -192,11 +192,11 @@ static int setExtraSamples(TIFF *tif, va_list ap, uint32_t *v) static uint16_t countInkNamesString(TIFF *tif, uint32_t slen, const char *s) { uint16_t i = 0; - const char *ep = s + slen; - const char *cp = s; if (slen > 0) { + const char *ep = s + slen; + const char *cp = s; do { for (; cp < ep && *cp != '\0'; cp++) |