Fix some static analyzer warnings

openvanilla · Jan 29, 2017 · 113257c · 113257c
1 parent e6120e3
commit 113257c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 18 deletions.
diff --git a/Modules/Array/LegacyFramework/OVCandidateList.cpp b/Modules/Array/LegacyFramework/OVCandidateList.cpp
@@ -65,15 +65,17 @@ void OVCandidateList::update(OVCandidate *textbar)
 			append(const_cast<char*>(list->at(i).c_str()))->
             append(" ");
     }
-
-    int totalpage=(count % perpage) ? (count/perpage)+1 : (count/perpage);
-    int currentpage=(pos/perpage)+1;
-//  if (totalpage >1)
-//  {
-        sprintf (buf, "(%d/%d)", currentpage, totalpage);
-        textbar->append(buf);
-//  }
-    textbar->update();   
+
+    if (perpage > 0) {
+        int totalpage = (count % perpage) ? (count/perpage)+1 : (count/perpage);
+        int currentpage=(pos/perpage)+1;
+    //  if (totalpage >1)
+    //  {
+            sprintf (buf, "(%d/%d)", currentpage, totalpage);
+            textbar->append(buf);
+    //  }
+    }
+    textbar->update();
 }
 
 OVCandidateList* OVCandidateList::pageUp()

diff --git a/Modules/Array/LegacyModule/LegacyOVIMArray.cpp b/Modules/Array/LegacyModule/LegacyOVIMArray.cpp
@@ -232,10 +232,8 @@ void OVIMArrayContext::sendAndReset(const char *ch, OVBuffer* buf,
         }
     }
 
-    bool committed = false;
     if (!(parent->isForceSP() && notifySP)) {
         buf->clear()->append(ch)->send();
-        committed = true;
     }
     else {
         buf->clear()->update();

diff --git a/Modules/Array/OVIMArray.cpp b/Modules/Array/OVIMArray.cpp
@@ -70,14 +70,20 @@ OVEventHandlingContext* OpenVanilla::OVIMArray::createContext()
             delete m_legacyArrayModule;
             m_legacyArrayModule = 0;
         }
+        else {
+            m_legacyArrayModule->setAutoSP(m_cfgAutoSP);
+            m_legacyArrayModule->setForceSP(m_cfgForceSP);
+        }
+    }
 
-        m_legacyArrayModule->setAutoSP(m_cfgAutoSP);
-        m_legacyArrayModule->setForceSP(m_cfgForceSP);
+    if (m_legacyArrayModule) {
+        ::OVIMArrayContext* legacyContext = static_cast<::OVIMArrayContext*>(m_legacyArrayModule->newContext());
+        OpenVanilla::OVIMArrayContext* context = new OpenVanilla::OVIMArrayContext(legacyContext);
+        return context;
+    }
+    else {
+        return nullptr;
     }
-
-    ::OVIMArrayContext* legacyContext = static_cast<::OVIMArrayContext*>(m_legacyArrayModule->newContext());
-    OpenVanilla::OVIMArrayContext* context = new OpenVanilla::OVIMArrayContext(legacyContext);
-    return context;
 }
 
 const string OpenVanilla::OVIMArray::identifier() const

diff --git a/Modules/Array/OVIMArrayContext.cpp b/Modules/Array/OVIMArrayContext.cpp
@@ -37,6 +37,11 @@ OpenVanilla::OVIMArrayContext::OVIMArrayContext(::OVIMArrayContext* legacyContex
 {
 }
 
+OpenVanilla::OVIMArrayContext::~OVIMArrayContext()
+{
+    delete m_legacyContext;
+}
+
 void OpenVanilla::OVIMArrayContext::startSession(OVLoaderService* loaderService)
 {
     m_legacyContext->clear();

diff --git a/Modules/Array/OVIMArrayContext.h b/Modules/Array/OVIMArrayContext.h
@@ -41,6 +41,7 @@ namespace OpenVanilla {
     class OVIMArrayContext : public OVEventHandlingContext {
     public:
         OVIMArrayContext(::OVIMArrayContext* legacyContext);
+        ~OVIMArrayContext();
         virtual void startSession(OVLoaderService* loaderService);
         virtual void stopSession(OVLoaderService* loaderService);
         virtual bool handleKey(OVKey* key, OVTextBuffer* readingText, OVTextBuffer* composingText, OVCandidateService* candidateService, OVLoaderService* loaderService);

diff --git a/Source/Mac/OVAFAssociatedPhrasesPreferencesViewController.m b/Source/Mac/OVAFAssociatedPhrasesPreferencesViewController.m
@@ -47,9 +47,9 @@ - (id)initWithCoder:(NSCoder *)aDecoder
 }
 
 - (void)dealloc {
-    [super dealloc];
     [_defaultSelectionKeys release];
     [_defaultSelectionKeyTitles release];
+    [super dealloc];
 }
 
 - (IBAction)updateField:(id)sender

diff --git a/Source/Mac/OVAddTableBasedInputMethodViewController.mm b/Source/Mac/OVAddTableBasedInputMethodViewController.mm
@@ -43,6 +43,13 @@ @implementation OVAddTableBasedInputMethodViewController
 @synthesize moreInfoTextField = _moreInfoTextField;
 @synthesize preferencesWindowController = _preferencesWindowController;
 
+- (void)dealloc
+{
+    [_tablePathToBeInstalled release];
+    [_moduleIdentifierIfInstalled release];
+    [super dealloc];
+}
+
 - (void)loadPreferences
 {
     // add link to the more info text field