shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "external_frame_buffer_test: quiet static analysis warnings"

--- a/test/external_frame_buffer_test.cc

+++ b/test/external_frame_buffer_test.cc

@@ -97,13 +97,19 @@

     return 0;

   }

-  // Marks the external frame buffer that |fb| is pointing too as free.

+  // Marks the external frame buffer that |fb| is pointing to as free.

   // Returns < 0 on an error.

   int ReturnFrameBuffer(vpx_codec_frame_buffer_t *fb) {

-    EXPECT_TRUE(fb != NULL);

+    if (fb == NULL) {

+      EXPECT_TRUE(fb != NULL);

+      return -1;

+    }

     ExternalFrameBuffer *const ext_fb =

         reinterpret_cast<ExternalFrameBuffer*>(fb->priv);

-    EXPECT_TRUE(ext_fb != NULL);

+    if (ext_fb == NULL) {

+      EXPECT_TRUE(ext_fb != NULL);

+      return -1;

+    }

     EXPECT_EQ(1, ext_fb->in_use);

     ext_fb->in_use = 0;

     return 0;