Merge pull request opencog#1163 from serval2412/master

Fix cppcheck reports:
beew · Dec 27, 2014 · d5be107 · d5be107
2 parents 03626a1 + bc5365c
commit d5be107
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/opencog/embodiment/Control/OperationalAvatarController/OCPlanner.cc b/opencog/embodiment/Control/OperationalAvatarController/OCPlanner.cc
@@ -823,7 +823,7 @@ ActionPlanID OCPlanner::doPlanning(const vector<State*>& goal,const vector<State
                 int negativeNum,satisfiedPreconNum;
                 checkRuleFitnessRoughly(r,curStateNode,satisfiedPreconNum,negativeNum,isNegativeGoal,isDiffStateOwnerType,preconImpossible,willAddCirle,contradictoryOtherGoal,needRollback);
 
-                if (isNegativeGoal || isDiffStateOwnerType || willAddCirle || contradictoryOtherGoal || willAddCirle || preconImpossible)
+                if (isNegativeGoal || isDiffStateOwnerType || willAddCirle || contradictoryOtherGoal || preconImpossible)
                     continue;
 
                 // this rule is positive for this goal, apply it.
@@ -3343,7 +3343,7 @@ bool OCPlanner::groundARuleNodeBySelectingNonNumericValues(RuleNode *ruleNode)
 
     }
 
-    delete indexes;
+    delete [] indexes;
 
     if (ruleNode->ParamCandidates.size() == 0)
     {

diff --git a/opencog/learning/clustering/blopex/fortran_matrix.c b/opencog/learning/clustering/blopex/fortran_matrix.c
@@ -1535,6 +1535,7 @@ zutilities_FortranMatrixPrint( utilities_FortranMatrix* mtx,
       fprintf(fp,"%22.14e  %22.14e \n",p->real,p->imag);
     p += jump;
   }
+  fclose(fp);
 
   return 0;
 }
diff --git a/opencog/nlp/chatbot/go-irc.cc b/opencog/nlp/chatbot/go-irc.cc
@@ -196,6 +196,7 @@ int got_privmsg(const char* params, irc_reply_data* ird, void* data)
 	else
 	{
 		conn->privmsg (msg_target, "Shell escapes disabled in this chatbot version\n");
+	        free(cmdline);
 		return 0;
 	}
 #endif /* ENABLE_SHELL_ESCAPES */

diff --git a/opencog/persist/file/SavingLoading.cc b/opencog/persist/file/SavingLoading.cc
@@ -276,6 +276,7 @@ void SavingLoading::load(const char *fileName,
     size_t rc = fread(&format, sizeof(char), 1, f);
 
     if (! (rc == 1 && format & FULL_NETWORK_DUMP)) {
+        fclose(f);
         throw RuntimeException(TRACE_INFO, "SavingLoading - invalid file format '%c'.", format);
     }
 

diff --git a/opencog/spatial/LocalSpaceMap2D.cc b/opencog/spatial/LocalSpaceMap2D.cc
@@ -306,7 +306,7 @@ void LocalSpaceMap2D::load(FILE* fp)
 
         addObject(std::string(id), metadata, isObstacle );
 
-        delete id;
+        delete [] id;
     }
     CHECK_FREAD;
 }

diff --git a/opencog/util/cluster.c b/opencog/util/cluster.c
@@ -2677,6 +2677,7 @@ double** distancematrix (int nrows, int ncolumns, double** data,
   if (i < n) /* break condition encountered */
   { j = i;
     for (i = 1; i < j; i++) free(matrix[i]);
+    free(matrix);
     return NULL;
   }
 

diff --git a/opencog/util/tree.h b/opencog/util/tree.h
@@ -1367,7 +1367,7 @@ typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_alloca
     // insert all siblings in new_first..new_last before orig_first
     bool first=true;
     pre_order_iterator ret;
-    while(1==1) {
+    while(true) {
         pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
         if(first) {
             ret=tt;
@@ -1381,7 +1381,7 @@ typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_alloca
     // erase old range of siblings
     bool last=false;
     tree_node *next=orig_first;
-    while(1==1) {
+    while(true) {
         if(next==orig_last)
             last=true;
         next=next->next_sibling;
@@ -1461,7 +1461,7 @@ iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begi
     last->next_sibling=0;
 
     tree_node *pos=first;
-    while(1==1) {
+    while(true) {
         pos->parent=position.node;
         if(pos==last) break;
         pos=pos->next_sibling;