Merge pull request livecode#2443 from livecodesebastien/coverity_scan

livecodesebastien · livecodesebastien · commit ab0f0c4cf028 · 2015-06-23T10:21:30.000+01:00
Coverity scan fixes
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -1017,13 +1017,10 @@ void MCIdeDmgBuild::exec_ctxt(MCExecContext& ctxt)
 
 	/////////
 
+    // SN-2015-06-19: [[ CID 100294 ]] Check the return value.
     MCAutoStringRef t_string;
-	if (!ctxt . HasError())
-    {
-        /* UNCHECKED */ ctxt . EvalExprAsStringRef(m_filename, EE_UNDEFINED, &t_string);
-    }
-
-	if (!ctxt . HasError())
+	if (!ctxt . HasError()
+            && ctxt . EvalExprAsStringRef(m_filename, EE_UNDEFINED, &t_string))
 	{
         MCAutoPointer<char> temp;
         if (!MCStringConvertToCString(*t_string, &temp))
diff --git a/engine/src/ibmp.cpp b/engine/src/ibmp.cpp
@@ -2711,8 +2711,9 @@ bool MCXWDImageLoader::LoadHeader(uint32_t &r_width, uint32_t &r_height, uint32_
 	char *newname = nil;
 
 	if (t_success)
-		t_success = nil != (newname = new char[namesize]) &&
-		IO_read(newname, namesize, stream) == IO_NORMAL;
+        // SN-2015-06-19: [[ CID 48071 ]] Use MCMemoryNewArray for consistency
+        t_success = MCMemoryNewArray(namesize, newname)
+            && IO_read(newname, namesize, stream) == IO_NORMAL;
 
 	if (t_success)
 	{
diff --git a/engine/src/player-legacy.cpp b/engine/src/player-legacy.cpp
@@ -2002,7 +2002,8 @@ void MCPlayer::getenabledtracks(uindex_t &r_count, uint32_t *&r_tracks_id)
 #elif defined(X11)
         x11_getenabledtracks(t_count, t_tracks_id);
 #else
-        0 == 0;
+    // SN-2015-06-19: [[ CID 100295 ]] Use brackets instead of true assertion
+    {}
 #endif
     
     r_count = t_count;
