Fixed weak places(after Prevent analyze)

Change-Id: Iee8654ba892560b6353f0e634b0ece4efb96a8fb

diff --git a/src/accel/sec_exa.c b/src/accel/sec_exa.c
index c62ede5..cb3b020 100644 (file)
--- a/src/accel/sec_exa.c
+++ b/src/accel/sec_exa.c
@@ -334,7 +334,8 @@ SECExaModifyPixmapHeader (PixmapPtr pPixmap, int width, int height,
         prop.crop.width = width;
         prop.crop.height = height;
 
-        secCvtEnsureSize (NULL, &prop);
+        if (!secCvtEnsureSize (NULL, &prop))
+            return FALSE;
 
         privPixmap->bo = secRenderBoCreate(pScrn, prop.width, prop.height);
         if (!privPixmap->bo)

diff --git a/src/accel/sec_exa_g2d.c b/src/accel/sec_exa_g2d.c
index d4e7e58..4957796 100644 (file)
--- a/src/accel/sec_exa_g2d.c
+++ b/src/accel/sec_exa_g2d.c
@@ -244,8 +244,8 @@ ExaBox* _g2dBoxAdd (struct xorg_list *l, BoxPtr b1, BoxPtr b2)
 
 void _g2dBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 {
-    ExaBox *b1, *b2;
-    ExaBox* r=NULL;
+    ExaBox *b1 = NULL, *b2 = NULL;
+    ExaBox* r = NULL;
 
     xorg_list_for_each_entry (b1, b, link)
     {
@@ -264,7 +264,7 @@ void _g2dBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t
 
 void _g2dBoxMove (struct xorg_list* l, int tx, int ty)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, l, link)
     {
@@ -274,7 +274,7 @@ void _g2dBoxMove (struct xorg_list* l, int tx, int ty)
 
 void _g2dBoxRemoveAll (struct xorg_list* l)
 {
-    ExaBox *ref, *next;
+    ExaBox *ref = NULL, *next = NULL;
 
     xorg_list_for_each_entry_safe (ref, next, l, link)
     {
@@ -298,7 +298,7 @@ int _g2dBoxIsOne (struct xorg_list* l)
 
 void _g2dBoxPrint (ExaBox* sb1, const char* name)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, &sb1->link, link)
     {
@@ -644,7 +644,7 @@ static void _g2dFinishAccess (PixmapPtr pPix, int index)
 void
 _g2dDoDraw (struct xorg_list *l, DoDrawProcPtrEx do_draw, void* data)
 {
-    ExaBox *box;
+    ExaBox *box = NULL;
     xorg_list_for_each_entry (box, l, link)
     {
         do_draw (box, data);

diff --git a/src/accel/sec_exa_sw.c b/src/accel/sec_exa_sw.c
index ea58d3f..feb1d9a 100644 (file)
--- a/src/accel/sec_exa_sw.c
+++ b/src/accel/sec_exa_sw.c
@@ -169,7 +169,7 @@ static OpDFS gOpDFS;
 
 ExaBox* _swBoxAdd (struct xorg_list *l, BoxPtr b1, BoxPtr b2)
 {
-    ExaBox* rgn;
+    ExaBox* rgn = NULL;
 
     rgn = calloc (1, sizeof (ExaBox));
     rgn->state = secUtilBoxIntersect (&rgn->box, b1, b2);
@@ -185,7 +185,7 @@ ExaBox* _swBoxAdd (struct xorg_list *l, BoxPtr b1, BoxPtr b2)
 
 void _swBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 {
-    ExaBox *b1, *b2;
+    ExaBox *b1 = NULL, *b2 = NULL;
     ExaBox* r=NULL;
 
     xorg_list_for_each_entry (b1, b, link)
@@ -205,7 +205,7 @@ void _swBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 
 void _swBoxMove (struct xorg_list* l, int tx, int ty)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, l, link)
     {
@@ -215,7 +215,7 @@ void _swBoxMove (struct xorg_list* l, int tx, int ty)
 
 void _swBoxRemoveAll (struct xorg_list* l)
 {
-    ExaBox *ref, *next;
+    ExaBox *ref = NULL, *next = NULL;
 
     xorg_list_for_each_entry_safe (ref, next, l, link)
     {
@@ -239,7 +239,7 @@ int _swBoxIsOne (struct xorg_list* l)
 
 void _swBoxPrint (ExaBox* sb1, const char* name)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, &sb1->link, link)
     {
@@ -317,7 +317,7 @@ static ExaOpInfo* _swPrepareAccess (PixmapPtr pPix, int index)
             if (num_bo == 0)
             {
                 num_bo = 1;
-                bos = (tbm_bo *)calloc(1, sizeof(tbm_bo *));
+                bos = (tbm_bo *)calloc(1, sizeof(tbm_bo));
                 bos[0] = pSec->pFb->default_bo;
             }
 #endif //NO_CRTC_MODE
@@ -439,7 +439,7 @@ static void _swFinishAccess (PixmapPtr pPix, int index)
 void
 _swDoDraw (struct xorg_list *l, DoDrawProcPtrEx do_draw, void* data)
 {
-    ExaBox *box;
+    ExaBox *box = NULL;
     xorg_list_for_each_entry (box, l, link)
     {
         do_draw (box, data);

diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index 0bfa172..32f1501 100644 (file)
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -2030,7 +2030,7 @@ Bool
 secCrtcCursorEnable (ScrnInfoPtr pScrn, Bool enable)
 {
     SECModePtr pSecMode = (SECModePtr) SECPTR (pScrn)->pSecMode;
-    SECCrtcPrivPtr pCur, pNext;
+    SECCrtcPrivPtr pCur = NULL, pNext;
 
     xorg_list_for_each_entry_safe (pCur, pNext, &pSecMode->crtcs, link)
     {

diff --git a/src/crtcconfig/sec_display.c b/src/crtcconfig/sec_display.c
index b72f0b8..e8e60af 100644 (file)
--- a/src/crtcconfig/sec_display.c
+++ b/src/crtcconfig/sec_display.c
@@ -590,14 +590,14 @@ secModeDeinit (ScrnInfoPtr pScrn)
         xf86CrtcDestroy (pCrtc);
     }
 
-    SECOutputPrivPtr output_ref, output_next;
+    SECOutputPrivPtr output_ref = NULL, output_next = NULL;
     xorg_list_for_each_entry_safe (output_ref, output_next, &pSecMode->outputs, link)
     {
         pOutput = output_ref->pOutput;
         xf86OutputDestroy (pOutput);
     }
 
-    SECPlanePrivPtr plane_ref, plane_next;
+    SECPlanePrivPtr plane_ref = NULL, plane_next = NULL;
     xorg_list_for_each_entry_safe (plane_ref, plane_next, &pSecMode->planes, link)
     {
         secPlaneDeinit (pScrn, plane_ref);
@@ -1754,7 +1754,7 @@ secDisplayChangeMode (ScrnInfoPtr pScrn)
             return TRUE;
         }
     }
-    SECOutputPrivPtr output_ref, output_next;
+    SECOutputPrivPtr output_ref = NULL, output_next = NULL;
 /* Priority LVDS > HDMI > Virtual */
     xorg_list_for_each_entry_safe (output_ref, output_next, &pSecMode->outputs, link)
     {

diff --git a/src/crtcconfig/sec_dummy.c b/src/crtcconfig/sec_dummy.c
index ed14dcb..38c9990 100644 (file)
--- a/src/crtcconfig/sec_dummy.c
+++ b/src/crtcconfig/sec_dummy.c
@@ -373,9 +373,9 @@ SECDummyOutputDetect(xf86OutputPtr pOutput)
     {
         if (pCur->is_dummy == FALSE && pCur->mode_output->connection == DRM_MODE_CONNECTED)
         {
-            return XF86OutputStatusDisconnected;
-/* TODO: Need to change flag useAsyncSwap not here */
+        /* TODO: Need to change flag useAsyncSwap not here */
             pSec->useAsyncSwap = FALSE;
+            return XF86OutputStatusDisconnected;
         }
     }
     pSec->useAsyncSwap = TRUE;
@@ -421,6 +421,7 @@ SECDummyOutputDestory(xf86OutputPtr pOutput)
 {
     XDBG_DEBUG(MDOUT,"\n");
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+
     if (pOutputPriv == NULL)
         return;
     SECPtr pSec = SECPTR (pOutput->scrn);
@@ -430,13 +431,16 @@ SECDummyOutputDestory(xf86OutputPtr pOutput)
         TimerFree (pSec->resume_timer);
         pSec->resume_timer = NULL;
     }
-    if (pOutputPriv->mode_output->modes)
-        free(pOutputPriv->mode_output->modes);
+
     if (pOutputPriv->mode_output)
-        free(pOutputPriv->mode_output);
-    if (pOutputPriv->mode_encoder)
-        free(pOutputPriv->mode_encoder);
+    {
+        if (pOutputPriv->mode_output->modes)
+            free (pOutputPriv->mode_output->modes);
+        free (pOutputPriv->mode_output);
+    }
 
+    if (pOutputPriv->mode_encoder)
+        free (pOutputPriv->mode_encoder);
 
     (pSec->pSecMode->num_dummy_output)--;
     xorg_list_del (&pOutputPriv->link);

diff --git a/src/crtcconfig/sec_output.c b/src/crtcconfig/sec_output.c
index 3da3737..9614e3c 100644 (file)
--- a/src/crtcconfig/sec_output.c
+++ b/src/crtcconfig/sec_output.c
@@ -759,7 +759,7 @@ secOutputDrmUpdate (ScrnInfoPtr pScrn)
                 ret = TRUE;
 #endif
         SECOutputPrivPtr pOutputPriv = NULL;
-        SECOutputPrivPtr pCur, pNext;
+        SECOutputPrivPtr pCur = NULL, pNext = NULL;
         drmModeConnectorPtr koutput;
         drmModeEncoderPtr kencoder;
         char *conn_str[] = {"connected", "disconnected", "unknow"};
@@ -1050,7 +1050,7 @@ secOutputGetPrivateForConnType (ScrnInfoPtr pScrn, int connect_type)
 
     for (i = 0; i < pSecMode->mode_res->count_connectors; i++)
     {
-        SECOutputPrivPtr pCur, pNext;
+        SECOutputPrivPtr pCur = NULL, pNext = NULL;
 
         xorg_list_for_each_entry_safe (pCur, pNext, &pSecMode->outputs, link)
         {

diff --git a/src/ipp/sec_wb.c b/src/ipp/sec_wb.c
index c70c699..1e246b4 100644 (file)
--- a/src/ipp/sec_wb.c
+++ b/src/ipp/sec_wb.c
@@ -760,12 +760,13 @@ _secWbCloseDrm (SECWb *wb)
         buf.buf_id = i;
 
         if (wb->dst_buf[i])
-            for (j = 0; j < EXYNOS_DRM_PLANAR_MAX && j < PLANAR_CNT; j++)
+            for (j = 0; j < EXYNOS_DRM_PLANAR_MAX; j++)
                 buf.handle[j] = wb->dst_buf[i]->handles[j];
 
-        secDrmIppQueueBuf (wb->pScrn, &buf);
+       secDrmIppQueueBuf (wb->pScrn, &buf);
+
+       wb->queued[i] = FALSE;
 
-        wb->queued[i] = FALSE;
     }
 
     CLEAR (ctrl);

diff --git a/src/util/sec_util.c b/src/util/sec_util.c
index 2771a2a..7870a55 100644 (file)
--- a/src/util/sec_util.c
+++ b/src/util/sec_util.c
@@ -648,7 +648,9 @@ secUtilFlushDump (void *d)
     if (!is_dir)
     {
         DIR *dp;
-        mkdir (dir, 0755);
+        if(mkdir (dir, 0755))
+            return;
+
         if (!(dp = opendir (dir)))
         {
             ErrorF ("failed: open'%s'\n", dir);
@@ -1482,6 +1484,8 @@ secUtilListAdd (void *list, void *key, void *user_data)
         return list;
 
     data = malloc (sizeof (ListData));
+    XDBG_RETURN_VAL_IF_FAIL (data != NULL, NULL);
+
     data->key = key;
     data->data = user_data;
 

diff --git a/src/xv/sec_video_virtual.c b/src/xv/sec_video_virtual.c
index 8890718..977de62 100644 (file)
--- a/src/xv/sec_video_virtual.c
+++ b/src/xv/sec_video_virtual.c
@@ -2304,67 +2304,64 @@ _secCaptureCloseConverter (SECPortPrivPtr pPort)
     XDBG_TRACE (MVA, "done. \n");
 }
 
-static Bool
-secCaptureConvertImage  (SECPortPrivPtr pPort,  SECVideoBuf *inbuf, int csc_range)
+static Bool secCaptureConvertImage(SECPortPrivPtr pPort, SECVideoBuf *inbuf,  int csc_range)
 {
-     SECCvtProp src_prop = {0,}, dst_prop = {0,};
-     SECVideoBuf *outbuf = NULL;
-
-     pPort->secure=0;
+    SECCvtProp src_prop = { 0, }, dst_prop = { 0, };
+    SECVideoBuf *outbuf = NULL;
 
-     src_prop.id = inbuf->id;
-     src_prop.width = inbuf->width;
-     src_prop.height = inbuf->height;
-     src_prop.crop = inbuf->crop;
+    pPort->secure = 0;
 
-     dst_prop.id = FOURCC_RGB32;
-     dst_prop.width = inbuf->width;
-     dst_prop.height = inbuf->height;
-     dst_prop.crop = inbuf->crop;
+    src_prop.id = inbuf->id;
+    src_prop.width = inbuf->width;
+    src_prop.height = inbuf->height;
+    src_prop.crop = inbuf->crop;
 
-     dst_prop.degree = 0;
-     dst_prop.hflip = 0;
-     dst_prop.vflip = 0;
-     dst_prop.secure = pPort->secure;
-     dst_prop.csc_range = 0;// pPort->csc_range;
+    dst_prop.id = FOURCC_RGB32;
+    dst_prop.width = inbuf->width;
+    dst_prop.height = inbuf->height;
+    dst_prop.crop = inbuf->crop;
 
-     if (!secCvtEnsureSize (&src_prop, &dst_prop))
-         goto fail_to_convert;
+    dst_prop.degree = 0;
+    dst_prop.hflip = 0;
+    dst_prop.vflip = 0;
+    dst_prop.secure = pPort->secure;
+    dst_prop.csc_range = 0;// pPort->csc_range;
 
-    outbuf = pPort->capture_dstbuf;
-     if (outbuf == NULL)
-     {
-         outbuf = secUtilAllocVideoBuffer (pPort->pScrn, FOURCC_RGB32,
-                                          dst_prop.width, dst_prop.height,
-                                          FALSE, FALSE, pPort->secure);
-         outbuf->crop = dst_prop.crop;
-     }
-    XDBG_GOTO_IF_FAIL (outbuf != NULL, fail_to_convert);
+    if (!secCvtEnsureSize(&src_prop, &dst_prop))
+        goto fail_to_convert;
 
-     if (!outbuf)
-         return FALSE;
+    XDBG_GOTO_IF_FAIL(pPort != NULL, fail_to_convert);
 
-     _secCaptureEnsureConverter (pPort);
-     XDBG_GOTO_IF_FAIL (pPort->cvt2 != NULL, fail_to_convert);
+    outbuf = pPort->capture_dstbuf;
+    if (outbuf == NULL)
+    {
+        outbuf = secUtilAllocVideoBuffer (pPort->pScrn, FOURCC_RGB32,
+                dst_prop.width, dst_prop.height,
+                FALSE, FALSE, pPort->secure);
+        outbuf->crop = dst_prop.crop;
+    }
+    XDBG_GOTO_IF_FAIL(outbuf != NULL, fail_to_convert);
 
-     if (!secCvtSetProperpty (pPort->cvt2, &src_prop, &dst_prop))
-         goto fail_to_convert;
+    _secCaptureEnsureConverter(pPort);
+    XDBG_GOTO_IF_FAIL(pPort->cvt2 != NULL, fail_to_convert);
 
-     if (!secCvtConvert (pPort->cvt2, inbuf, outbuf))
-         goto fail_to_convert;
+    if (!secCvtSetProperpty(pPort->cvt2, &src_prop, &dst_prop))
+        goto fail_to_convert;
 
+    if (!secCvtConvert(pPort->cvt2, inbuf, outbuf))
+        goto fail_to_convert;
 
-     secUtilVideoBufferUnref (outbuf);
+    secUtilVideoBufferUnref (outbuf);
 
-     return TRUE;
+    return TRUE;
 
 fail_to_convert:
 
-     if (outbuf)
-         secUtilVideoBufferUnref (outbuf);
+    if (outbuf)
+        secUtilVideoBufferUnref (outbuf);
 
-     _secCaptureCloseConverter (pPort);
+    _secCaptureCloseConverter(pPort);
 
-     return FALSE;
- }
+    return FALSE;
+}