From 60cce948bc8419c15a7fe8ab9669f4ae87c5ef76 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 3 Mar 2013 00:35:26 +0300
Subject: another fixes from Coverity checks.

---
 src/net/download.cpp               | 19 ++++++++++++++++---
 src/utils/translation/poparser.cpp | 11 +++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/net/download.cpp b/src/net/download.cpp
index 32625b181..2124736ca 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -286,7 +286,11 @@ int Download::downloadThread(void *ptr)
 
                 if (!d->mOptions.memoryWrite)
                 {
-                    fclose(file);
+                    if (file)
+                    {
+                        fclose(file);
+                        file = nullptr;
+                    }
                     ::remove(outFilename.c_str());
                 }
                 attempts++;
@@ -305,7 +309,11 @@ int Download::downloadThread(void *ptr)
 
                     if (d->mAdler != adler)
                     {
-                        fclose(file);
+                        if (file)
+                        {
+                            fclose(file);
+                            file = nullptr;
+                        }
 
                         // Remove the corrupted file
                         ::remove(d->mFileName.c_str());
@@ -316,7 +324,11 @@ int Download::downloadThread(void *ptr)
                         continue; // Bail out here to avoid the renaming
                     }
                 }
-                fclose(file);
+                if (file)
+                {
+                    fclose(file);
+                    file = nullptr;
+                }
 
                 // Any existing file with this name is deleted first, otherwise
                 // the rename will fail on Windows.
@@ -331,6 +343,7 @@ int Download::downloadThread(void *ptr)
                     if (file)
                     {
                         fclose(file);
+                        file = nullptr;
                         complete = true;
                     }
                 }
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index dc201d4b3..2c880ba27 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -46,8 +46,15 @@ void PoParser::openFile(std::string name)
     int size;
     char *buf = static_cast<char*>(resman->loadFile(getFileName(name), size));
 
-    mFile.str(std::string(buf, size));
-    free(buf);
+    if (buf)
+    {
+        mFile.str(std::string(buf, size));
+        free(buf);
+    }
+    else
+    {
+        mFile.clear();
+    }
 }
 
 PoDict *PoParser::load(const std::string &lang, const std::string &fileName,
-- 
cgit v1.2.3-60-g2f50