Merge pull request #5305 from lukegb/bug/format-strings

radarhere · web-flow · commit f91f93e246d7 · 2021-03-11T22:34:17.000+11:00
Fix -Wformat error in TiffDecode
diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
@@ -56,7 +56,7 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {
     dump_state(state);
 
     if (state->loc > state->eof) {
-        TIFFError("_tiffReadProc", "Invalid Read at loc %d, eof: %d", state->loc, state->eof);
+        TIFFError("_tiffReadProc", "Invalid Read at loc %llu, eof: %llu", state->loc, state->eof);
         return 0;
     }
     to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {`
`56`	`56`	`dump_state(state);`
`57`	`57`
`58`	`58`	`if (state->loc > state->eof) {`
`59`		`- TIFFError("_tiffReadProc", "Invalid Read at loc %d, eof: %d", state->loc, state->eof);`
	`59`	`+ TIFFError("_tiffReadProc", "Invalid Read at loc %llu, eof: %llu", state->loc, state->eof);`
`60`	`60`	`return 0;`
`61`	`61`	`}`
`62`	`62`	`to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);`