Turn on -Werror=mismatched-new-delete

Monte Goulding · montegoulding · commit b9802f06af76 · 2016-09-13T21:16:09.000+10:00
diff --git a/config/mac.gypi b/config/mac.gypi
@@ -129,6 +129,7 @@
 							'-Werror=logical-not-parentheses',
 							'-Werror=conversion-null',
 							'-Werror=missing-declarations',
+							'-Werror=mismatched-new-delete',
 						],
 					},
 				},
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -303,7 +303,7 @@ OSErr MCAppleEventHandlerDoSpecial(const AppleEvent *ae, AppleEvent *reply, long
 			err = errAEEventNotHandled;
 	// do nothing if the AE is not handled,
 	// let the standard AE dispacher to dispatch this AE
-	delete p3val;
+	delete[] p3val;
 	return err;
 }
 
@@ -2385,7 +2385,7 @@ struct MCMacSystemService: public MCMacSystemServiceInterface//, public MCMacDes
             char *buffer = new char[6 + I2L];
             sprintf(buffer, "error %d", errno);
             MCresult->copysvalue(buffer);
-            delete buffer;
+            delete[] buffer;
             return;
         }
         if (p_reply == True)
@@ -2595,7 +2595,7 @@ struct MCMacSystemService: public MCMacSystemServiceInterface//, public MCMacDes
             char *buffer = new char[6 + I2L];
             sprintf(buffer, "error %d", errno);
             MCresult->copysvalue(buffer);
-            delete buffer;
+            delete[] buffer;
             
             r_value = MCValueRetain(kMCEmptyString);
             return false;
@@ -3730,7 +3730,7 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
             char *buffer = new char[6 + I2L];
             sprintf(buffer, "error %d", errno);
             MCresult->copysvalue(buffer);
-            delete buffer;
+            delete[] buffer;
             return false;
         }
         if (!MCListCreateMutable('\n', &t_list))
diff --git a/engine/src/hc.cpp b/engine/src/hc.cpp
@@ -662,7 +662,7 @@ IO_stat MCHctext::parse(char *sptr)
 		strncpy(newstring, &sptr[offset], tsize);
 		newstring[tsize] = '\0';
 		string = convert_string(newstring);
-		delete newstring;
+		delete[] newstring;
 	}
 	return IO_NORMAL;
 }
@@ -2056,7 +2056,7 @@ IO_stat MCHcstak::read(IO_handle stream)
 				delete name;
 				name = new char[uint1ptr[0] + 1];
 				strcpy(name, &tbuffer[1]);
-				delete tbuffer;
+				delete[] tbuffer;
 
 				uint2 toffset = uint1ptr[0] + 2;
 				if (!strnequal(&fullbuffer[toffset], "STAK", 4))
diff --git a/engine/src/opensslsocket.cpp b/engine/src/opensslsocket.cpp
@@ -1506,7 +1506,7 @@ void MCSocket::readsome()
 		if ((l = recvfrom(fd, dbuffer, l, 0,
 						  (struct sockaddr *)&addr, &addrsize)) < 0)
 		{
-			delete dbuffer;
+			delete[] dbuffer;
 			if (!doread && errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)
 			{
 				error = new char[21 + I4L];
@@ -1518,7 +1518,7 @@ void MCSocket::readsome()
 		else
 		{
 			if (message == NULL)
-				delete dbuffer;
+				delete[] dbuffer;
 			else
 			{
 				char *t = inet_ntoa(addr.sin_addr);
diff --git a/revdb/src/osxsupport.cpp b/revdb/src/osxsupport.cpp
@@ -335,7 +335,7 @@ char *MCS_resolvepath(const char *p_path)
   char *newname = new char[PATH_MAX + 2];
   if ((size = readlink(tildepath, newname, PATH_MAX)) < 0) {
     delete tildepath;
-    delete newname;
+    delete[] newname;
     return NULL;
   }
   delete tildepath;
@@ -349,9 +349,9 @@ char *MCS_resolvepath(const char *p_path)
     else
       sptr++;
     strcpy(sptr, newname);
-    delete newname;
+    delete[] newname;
     newname = MCS_resolvepath(fullpath);
-    delete fullpath;
+    delete[] fullpath;
   }
   return newname;
 
diff --git a/revxml/src/revxml.cpp b/revxml/src/revxml.cpp
@@ -291,7 +291,7 @@ void CB_elementData(const char *data, int length)
 	memcpy(buffer, data, length);
 	buffer[length] = '\0';
 	DispatchMetaCardMessage("revStartXMLData",(char *)buffer);
-	delete buffer;
+	delete[] buffer;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ void MCSocket::readsome()`
`1506`	`1506`	`if ((l = recvfrom(fd, dbuffer, l, 0,`
`1507`	`1507`	`(struct sockaddr *)&addr, &addrsize)) < 0)`
`1508`	`1508`	`{`
`1509`		`- delete dbuffer;`
	`1509`	`+ delete[] dbuffer;`
`1510`	`1510`	`if (!doread && errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)`
`1511`	`1511`	`{`
`1512`	`1512`	`error = new char[21 + I4L];`
`@@ -1518,7 +1518,7 @@ void MCSocket::readsome()`
`1518`	`1518`	`else`
`1519`	`1519`	`{`
`1520`	`1520`	`if (message == NULL)`
`1521`		`- delete dbuffer;`
	`1521`	`+ delete[] dbuffer;`
`1522`	`1522`	`else`
`1523`	`1523`	`{`
`1524`	`1524`	`char *t = inet_ntoa(addr.sin_addr);`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ void CB_elementData(const char *data, int length)`
`291`	`291`	`memcpy(buffer, data, length);`
`292`	`292`	`buffer[length] = '\0';`
`293`	`293`	`DispatchMetaCardMessage("revStartXMLData",(char *)buffer);`
`294`		`- delete buffer;`
	`294`	`+ delete[] buffer;`
`295`	`295`	`}`
`296`	`296`
`297`	`297`