OSDN Git Service
(root)
/
android-x86
/
external-drm_hwcomposer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
acdea8c
)
drm_hwcomposer: Return error from GetEdidBlob if blob is null
author
Marijn Suijten
<marijns95@gmail.com>
Sat, 19 Sep 2020 10:12:03 +0000
(12:12 +0200)
committer
Marijn Suijten
<marijns95@gmail.com>
Sat, 26 Sep 2020 20:43:15 +0000
(22:43 +0200)
drmModeGetPropertyBlob can return NULL blobs resulting in a segfault in
GetDisplayIdentificationData which expects blob to be set to a valid
pointer when GetEdidBlob returns 0.
Fixes:
adc5d8229b9ce25f1bf0e4d02bb838eae62b89fc
Signed-off-by: Marijn Suijten <marijns95@gmail.com>
drm/DrmConnector.cpp
patch
|
blob
|
history
diff --git
a/drm/DrmConnector.cpp
b/drm/DrmConnector.cpp
index
0de0f91
..
f1b6c1b
100644
(file)
--- a/
drm/DrmConnector.cpp
+++ b/
drm/DrmConnector.cpp
@@
-103,7
+103,7
@@
int DrmConnector::GetEdidBlob(drmModePropertyBlobPtr &blob) {
}
blob = drmModeGetPropertyBlob(drm_->fd(), blob_id);
- return
0
;
+ return
!blob
;
}
uint32_t DrmConnector::id() const {