[x265] [PATCH] zone: Fix encoder crash in linux

[pooja]

# HG changeset patch
# User Pooja Venkatesan <po...@multicorewareinc.com>
# Date 1549621973 -19800
#      Fri Feb 08 16:02:53 2019 +0530
# Node ID dcbec33bfb0f1cabdb1ff9eaadba5305ba23e6fa
# Parent  5b90dc59b57a8ea8f4fb269400c2335be3bb73c1
zone: Fix encoder crash in linux

Handle passing NULL to strdup()

diff -r 5b90dc59b57a -r dcbec33bfb0f source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp        Thu Feb 07 16:29:36 2019 +0530
+++ b/source/encoder/encoder.cpp        Fri Feb 08 16:02:53 2019 +0530
@@ -2651,7 +2651,8 @@
     p->bEnableRectInter = zone->bEnableRectInter;
     p->maxNumMergeCand = zone->maxNumMergeCand;
     p->bIntraInBFrames = zone->bIntraInBFrames;
-    p->scalingLists = strdup(zone->scalingLists);
+    if(zone->scalingLists)
+        p->scalingLists = strdup(zone->scalingLists);
 
     p->rc.aqMode = zone->rc.aqMode;
     p->rc.aqStrength = zone->rc.aqStrength;

# HG changeset patch
# User Pooja Venkatesan <po...@multicorewareinc.com>
# Date 1549621973 -19800
#      Fri Feb 08 16:02:53 2019 +0530
# Node ID dcbec33bfb0f1cabdb1ff9eaadba5305ba23e6fa
# Parent  5b90dc59b57a8ea8f4fb269400c2335be3bb73c1
zone: Fix encoder crash in linux

Handle passing NULL to strdup()

diff -r 5b90dc59b57a -r dcbec33bfb0f source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Thu Feb 07 16:29:36 2019 +0530
+++ b/source/encoder/encoder.cpp	Fri Feb 08 16:02:53 2019 +0530
@@ -2651,7 +2651,8 @@
     p->bEnableRectInter = zone->bEnableRectInter;
     p->maxNumMergeCand = zone->maxNumMergeCand;
     p->bIntraInBFrames = zone->bIntraInBFrames;
-    p->scalingLists = strdup(zone->scalingLists);
+    if(zone->scalingLists)
+        p->scalingLists = strdup(zone->scalingLists);
 
     p->rc.aqMode = zone->rc.aqMode;
     p->rc.aqStrength = zone->rc.aqStrength;

_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel