[FFmpeg-cvslog] lavc/videotoolboxenc: fix loadVTEncSymbols crash when symbol not found

jerett git at videolan.org
Fri Jun 23 16:38:05 EEST 2017


ffmpeg | branch: master | jerett <wj.jiang at outlook.com> | Fri Jun 23 08:57:18 2017 -0400| [82a8724df2a5cd7c64d163a3a0939a14f0d7d024] | committer: Rick Kern

lavc/videotoolboxenc: fix loadVTEncSymbols crash when symbol not found

Signed-off-by: Rick Kern <kernrj at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82a8724df2a5cd7c64d163a3a0939a14f0d7d024
---

 libavcodec/videotoolboxenc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 638f278cd0..7b901dbd69 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -73,11 +73,11 @@ static struct{
 
 #define GET_SYM(symbol, defaultVal)                                     \
 do{                                                                     \
-    CFStringRef cfstr = *(CFStringRef*)dlsym(RTLD_DEFAULT, #symbol);    \
-    if(!cfstr)                                                          \
+    CFStringRef* handle = (CFStringRef*)dlsym(RTLD_DEFAULT, #symbol);   \
+    if(!handle)                                                         \
         compat_keys.symbol = CFSTR(defaultVal);                         \
     else                                                                \
-        compat_keys.symbol = cfstr;                                     \
+        compat_keys.symbol = *handle;                                   \
 }while(0)
 
 static pthread_once_t once_ctrl = PTHREAD_ONCE_INIT;



More information about the ffmpeg-cvslog mailing list