Skip to content

Commit f81833a

Browse files
committed
Remove more unnecessary NULL checks before free()
1 parent 00607ec commit f81833a

5 files changed

Lines changed: 6 additions & 11 deletions

File tree

cjpeg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -682,12 +682,10 @@ main(int argc, char **argv)
682682

683683
if (memdst) {
684684
fprintf(stderr, "Compressed size: %lu bytes\n", outsize);
685-
if (outbuffer != NULL)
686-
free(outbuffer);
685+
free(outbuffer);
687686
}
688687

689-
if (icc_profile != NULL)
690-
free(icc_profile);
688+
free(icc_profile);
691689

692690
/* All done. */
693691
exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);

djpeg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ main(int argc, char **argv)
813813
end_progress_monitor((j_common_ptr)&cinfo);
814814
#endif
815815

816-
if (memsrc && inbuffer != NULL)
816+
if (memsrc)
817817
free(inbuffer);
818818

819819
/* All done. */

jdatadst-tj.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
103103

104104
MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
105105

106-
if (dest->newbuffer != NULL)
107-
free(dest->newbuffer);
106+
free(dest->newbuffer);
108107

109108
dest->newbuffer = nextbuffer;
110109

jdatadst.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
143143

144144
MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
145145

146-
if (dest->newbuffer != NULL)
147-
free(dest->newbuffer);
146+
free(dest->newbuffer);
148147

149148
dest->newbuffer = nextbuffer;
150149

jpegtran.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,7 @@ main(int argc, char **argv)
591591
end_progress_monitor((j_common_ptr)&dstinfo);
592592
#endif
593593

594-
if (icc_profile != NULL)
595-
free(icc_profile);
594+
free(icc_profile);
596595

597596
/* All done. */
598597
exit(jsrcerr.num_warnings + jdsterr.num_warnings ?

0 commit comments

Comments
 (0)