summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-10-29 13:43:16 -0400
committerTim-Philipp Müller <tim@centricular.com>2020-10-30 12:43:08 +0000
commitf3ec6dfa37a25d335882467f2671f9fbdacf0727 (patch)
tree8dd65876f9e6d18fe4a07b741a642bf5650b5bba
parent91baa1055bf8ed5a76065be012ab13a51e125215 (diff)
downloadgstreamer-plugins-bad-f3ec6dfa37a25d335882467f2671f9fbdacf0727.tar.gz
amc: Fix crash when encoding AVC
gstamcvideoenc.c calls gst_amc_avc_profile_to_string() with alternatives set to NULL which causes a crash. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1739>
-rw-r--r--sys/androidmedia/gstamc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c
index 82760469e..527446a5f 100644
--- a/sys/androidmedia/gstamc.c
+++ b/sys/androidmedia/gstamc.c
@@ -1197,7 +1197,8 @@ gst_amc_avc_profile_to_string (gint profile, const gchar ** alternative)
for (i = 0; i < G_N_ELEMENTS (avc_profile_mapping_table); i++) {
if (avc_profile_mapping_table[i].id == profile) {
- *alternative = avc_profile_mapping_table[i].alt_str;
+ if (alternative != NULL)
+ *alternative = avc_profile_mapping_table[i].alt_str;
return avc_profile_mapping_table[i].str;
}
}