Commit c6f41df7 authored by Even Rouault's avatar Even Rouault

libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on…

libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770
parent 5848777b
Pipeline #15667019 passed with stages
in 5 minutes and 59 seconds
...@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) ...@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", fprintf(fd, " %3lu: [%8I64u, %8I64u]\n",
(unsigned long) s, (unsigned long) s,
(unsigned __int64) td->td_stripoffset[s], td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0,
(unsigned __int64) td->td_stripbytecount[s]); td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0);
#else #else
fprintf(fd, " %3lu: [%8llu, %8llu]\n", fprintf(fd, " %3lu: [%8llu, %8llu]\n",
(unsigned long) s, (unsigned long) s,
(unsigned long long) td->td_stripoffset[s], td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0,
(unsigned long long) td->td_stripbytecount[s]); td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0);
#endif #endif
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment