Merge pull request #1688 from stweil/cov

Check return values from fopen (fixes several Coverity Scan reports)
tesseract-ocr · Jun 20, 2018 · 2bb4c4e · 2bb4c4e
2 parents b344dc1 + 2a5a092
commit 2bb4c4e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp
@@ -1195,8 +1195,12 @@ bool TessBaseAPI::ProcessPage(Pix* pix, int page_index, const char* filename,
   if (failed && retry_config != nullptr && retry_config[0] != '\0') {
     // Save current config variables before switching modes.
     FILE* fp = fopen(kOldVarsFile, "wb");
-    PrintVariables(fp);
-    fclose(fp);
+    if (fp == nullptr) {
+      tprintf("Error, failed to open file \"%s\"\n", kOldVarsFile);
+    } else {
+      PrintVariables(fp);
+      fclose(fp);
+    }
     // Switch to alternate mode for retry.
     ReadConfigFile(retry_config);
     SetImage(pix);

diff --git a/src/ccmain/control.cpp b/src/ccmain/control.cpp
@@ -128,8 +128,12 @@ bool Tesseract::ProcessTargetWord(const TBOX& word_box,
       if (backup_config_file_ == nullptr) {
         backup_config_file_ = kBackUpConfigFile;
         FILE* config_fp = fopen(backup_config_file_, "wb");
-        ParamUtils::PrintParams(config_fp, params());
-        fclose(config_fp);
+        if (config_fp == nullptr) {
+          tprintf("Error, failed to open file \"%s\"\n", backup_config_file_);
+        } else {
+          ParamUtils::PrintParams(config_fp, params());
+          fclose(config_fp);
+        }
         ParamUtils::ReadParamsFile(word_config,
                                    SET_PARAM_CONSTRAINT_DEBUG_ONLY,
                                    params());

diff --git a/src/classify/mastertrainer.cpp b/src/classify/mastertrainer.cpp
@@ -578,8 +578,12 @@ void MasterTrainer::WriteInttempAndPFFMTable(const UNICHARSET& unicharset,
   INT_TEMPLATES int_templates = classify->CreateIntTemplates(float_classes,
                                                              shape_set);
   FILE* fp = fopen(inttemp_file, "wb");
-  classify->WriteIntTemplates(fp, int_templates, shape_set);
-  fclose(fp);
+  if (fp == nullptr) {
+    tprintf("Error, failed to open file \"%s\"\n", inttemp_file);
+  } else {
+    classify->WriteIntTemplates(fp, int_templates, shape_set);
+    fclose(fp);
+  }
   // Now write pffmtable. This is complicated by the fact that the adaptive
   // classifier still wants one indexed by unichar-id, but the static
   // classifier needs one indexed by its shape class id.
@@ -612,15 +616,19 @@ void MasterTrainer::WriteInttempAndPFFMTable(const UNICHARSET& unicharset,
     shapetable_cutoffs.push_back(max_length);
   }
   fp = fopen(pffmtable_file, "wb");
-  shapetable_cutoffs.Serialize(fp);
-  for (int c = 0; c < unicharset.size(); ++c) {
-    const char *unichar = unicharset.id_to_unichar(c);
-    if (strcmp(unichar, " ") == 0) {
-      unichar = "NULL";
+  if (fp == nullptr) {
+    tprintf("Error, failed to open file \"%s\"\n", pffmtable_file);
+  } else {
+    shapetable_cutoffs.Serialize(fp);
+    for (int c = 0; c < unicharset.size(); ++c) {
+      const char *unichar = unicharset.id_to_unichar(c);
+      if (strcmp(unichar, " ") == 0) {
+        unichar = "NULL";
+      }
+      fprintf(fp, "%s %d\n", unichar, unichar_cutoffs[c]);
     }
-    fprintf(fp, "%s %d\n", unichar, unichar_cutoffs[c]);
+    fclose(fp);
   }
-  fclose(fp);
   free_int_templates(int_templates);
   delete classify;
 }