OSDN Git Service
(root)
/
android-x86
/
hardware-intel-common-vaapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid NULL pointer deref in i965_CreateConfig
[android-x86/hardware-intel-common-vaapi.git]
/
src
/
i965_drv_video.c
diff --git
a/src/i965_drv_video.c
b/src/i965_drv_video.c
index
7e87870
..
67d1186
100644
(file)
--- a/
src/i965_drv_video.c
+++ b/
src/i965_drv_video.c
@@
-1305,10
+1305,10
@@
i965_CreateConfig(VADriverContextP ctx,
case VAProfileH264ConstrainedBaseline:
case VAProfileH264Main:
case VAProfileH264High:
case VAProfileH264ConstrainedBaseline:
case VAProfileH264Main:
case VAProfileH264High:
- if ((entrypoint == VAEntrypointEncSlice) &&
+ if ((entrypoint == VAEntrypointEncSlice) &&
attrib_found &&
!(attrib_found->value & i965->codec_info->h264_brc_mode))
vaStatus = VA_STATUS_ERROR_INVALID_CONFIG;
!(attrib_found->value & i965->codec_info->h264_brc_mode))
vaStatus = VA_STATUS_ERROR_INVALID_CONFIG;
- else if ((entrypoint == VAEntrypointEncSliceLP) &&
+ else if ((entrypoint == VAEntrypointEncSliceLP) &&
attrib_found &&
!(attrib_found->value & i965->codec_info->lp_h264_brc_mode))
vaStatus = VA_STATUS_ERROR_INVALID_CONFIG;
break;
!(attrib_found->value & i965->codec_info->lp_h264_brc_mode))
vaStatus = VA_STATUS_ERROR_INVALID_CONFIG;
break;