fix low memory crash issue

wayne committed 7 years ago

Commit d58148c1 parent 9a815399 files · +38 −24Browse files

Showing the changes to test/api/BaseDecoderTest.cpp (1 of 9 files). Show all

Unified · Split

 #include "utils/BufferedData.h"
 #include "BaseDecoderTest.h"
-static void ReadFrame (std::ifstream* file, BufferedData* buf) {
+static bool ReadFrame (std::ifstream* file, BufferedData* buf) {
   // start code of a frame is {0, 0, 0, 1}
   int zeroCount = 0;
   char b;
   for (;;) {
     file->read (&b, 1);
     if (file->gcount() != 1) { // end of file
-      return;
+      return true;
     }
     if (!buf->PushBack (b)) {
-      FAIL() << "unable to allocate memory";
+      std::cout << "unable to allocate memory" << std::endl;
+      return false;
     }
     if (buf->Length() <= 4) {
     } else {
       if (b == 1) {
         if (file->seekg (-4, file->cur).good()) {
-          buf->SetLength (buf->Length() - 4);
+          if (-1 == buf->SetLength(buf->Length() - 4))
-          return;
+            return false;
+          return true;
         } else {
-          FAIL() << "unable to seek file";
+          std::cout << "unable to seek file" << std::endl;
+          return false;
         }
       } else if (b == 0) {
         zeroCount = 3;
     cbk->onDecodeFrame (frame);
   }
 }
-void BaseDecoderTest::DecodeFile (const char* fileName, Callback* cbk) {
+bool BaseDecoderTest::DecodeFile (const char* fileName, Callback* cbk) {
   std::ifstream file (fileName, std::ios::in | std::ios::binary);
-  ASSERT_TRUE (file.is_open());
+  if (!file.is_open())
+    return false;
   BufferedData buf;
   while (true) {
-    ReadFrame (&file, &buf);
+    if (false == ReadFrame(&file, &buf))
+      return false;
     if (::testing::Test::HasFatalFailure()) {
-      return;
+      return false;
     }
     if (buf.Length() == 0) {
       break;
     }
     DecodeFrame (buf.data(), buf.Length(), cbk);
     if (::testing::Test::HasFatalFailure()) {
-      return;
+      return false;
     }
   }
   for (int32_t i = 0; i < num_of_frames_in_buffer; ++i) {
     FlushFrame (cbk);
   }
+  return true;
 }
 bool BaseDecoderTest::Open (const char* fileName) {
 bool BaseDecoderTest::DecodeNextFrame (Callback* cbk) {
   switch (decodeStatus_) {
   case Decoding:
-    ReadFrame (&file_, &buf_);
+    if (false == ReadFrame(&file_, &buf_))
+      return false;
     if (::testing::Test::HasFatalFailure()) {
       return false;
     }

fix low memory crash issue

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code