Fix CID 1164570 (Dereference after null check) (#1333)

Show a warning if datapath_ is NULL instead of crashing. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · Feb 21, 2018 · eb8a6a5 · eb8a6a5
1 parent 6a58b2e
commit eb8a6a5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/api/baseapi.cpp b/api/baseapi.cpp
@@ -2287,9 +2287,15 @@ int TessBaseAPI::FindLines() {
     } else {
       osd_tesseract_ = new Tesseract;
       TessdataManager mgr(reader_);
-      if (osd_tesseract_->init_tesseract(datapath_->string(), nullptr, "osd",
-                                         OEM_TESSERACT_ONLY, nullptr, 0,
-                                         nullptr, nullptr, false, &mgr) == 0) {
+      if (datapath_ == nullptr) {
+        tprintf("Warning: Auto orientation and script detection requested,"
+                " but data path is undefined\n");
+        delete osd_tesseract_;
+        osd_tesseract_ = nullptr;
+      } else if (osd_tesseract_->init_tesseract(datapath_->string(), nullptr,
+                                                "osd", OEM_TESSERACT_ONLY,
+                                                nullptr, 0, nullptr, nullptr,
+                                                false, &mgr) == 0) {
         osd_tess = osd_tesseract_;
         osd_tesseract_->set_source_resolution(
             thresholder_->GetSourceYResolution());