projects
/
platform
/
upstream
/
libexif.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8272f10
)
Fixed a potential NULL pointer dereference in exif_loader_get_buf.
author
Dan Fandrich
<dan@coneharvesters.com>
Mon, 4 Feb 2019 15:27:17 +0000
(16:27 +0100)
committer
Dan Fandrich
<dan@coneharvesters.com>
Mon, 4 Feb 2019 15:28:00 +0000
(16:28 +0100)
This would only happen if given a NULL pointer by the application.
Found by Clang scan-build.
libexif/exif-loader.c
patch
|
blob
|
history
diff --git
a/libexif/exif-loader.c
b/libexif/exif-loader.c
index
317b86b
..
e2208b4
100644
(file)
--- a/
libexif/exif-loader.c
+++ b/
libexif/exif-loader.c
@@
-410,9
+410,12
@@
exif_loader_get_buf (ExifLoader *loader, const unsigned char **buf,
const unsigned char* b = NULL;
unsigned int s = 0;
- if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN)) {
+ if (!loader)
+ return;
+ if (loader->data_format == EL_DATA_FORMAT_UNKNOWN) {
exif_log (loader->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
"Loader format unknown");
+ return;
} else {
b = loader->buf;
s = loader->bytes_read;