From ce947adf8f33a28c50c3f9083859a3f64c035601 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 24 Mar 2016 23:56:12 +0100
Subject: [PATCH] Replace uses of "delete" with "delete[]" where appropriate

---
 dtool/src/dtoolutil/executionEnvironment.cxx     | 3 +--
 dtool/src/dtoolutil/pfstreamBuf.cxx              | 2 +-
 panda/src/downloader/download_utils.cxx          | 4 ++--
 panda/src/pnmimagetypes/pnmFileTypeJPGWriter.cxx | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dtool/src/dtoolutil/executionEnvironment.cxx b/dtool/src/dtoolutil/executionEnvironment.cxx
index a51fb7741c..b6ae2c7f71 100644
--- a/dtool/src/dtoolutil/executionEnvironment.cxx
+++ b/dtool/src/dtoolutil/executionEnvironment.cxx
@@ -283,7 +283,7 @@ ns_get_environment_variable(const string &var) const {
         if (item != NULL) {
           if (PyUnicode_Check(item)) {
             Py_ssize_t size = PyUnicode_GetSize(item);
-            wchar_t *data = new wchar_t[size + 1];
+            wchar_t *data = (wchar_t *)alloca(sizeof(wchar_t) * (size + 1));
 #if PY_MAJOR_VERSION >= 3
             if (PyUnicode_AsWideChar(item, data, size) != -1) {
 #else
@@ -292,7 +292,6 @@ ns_get_environment_variable(const string &var) const {
               wstring wstr (data, size);
               main_dir = Filename::from_os_specific_w(wstr);
             }
-            delete data;
           }
 #if PY_MAJOR_VERSION < 3
           else if (PyString_Check(item)) {
diff --git a/dtool/src/dtoolutil/pfstreamBuf.cxx b/dtool/src/dtoolutil/pfstreamBuf.cxx
index fc0de36048..1fd59207ca 100644
--- a/dtool/src/dtoolutil/pfstreamBuf.cxx
+++ b/dtool/src/dtoolutil/pfstreamBuf.cxx
@@ -122,7 +122,7 @@ int PipeStreamBuf::underflow(void) {
 #endif /* PHAVE_IOSTREAM */
     gbump(-((int)n));
   }
-  delete buf;
+  delete[] buf;
   return ret;
 }
 
diff --git a/panda/src/downloader/download_utils.cxx b/panda/src/downloader/download_utils.cxx
index d1aba78fd6..be31c81cd8 100644
--- a/panda/src/downloader/download_utils.cxx
+++ b/panda/src/downloader/download_utils.cxx
@@ -41,7 +41,7 @@ check_crc(Filename name) {
   unsigned long crc = crc32(0L, Z_NULL, 0);
   crc = crc32(crc, (unsigned char *)buffer, buffer_length);
 
-  delete buffer;
+  delete[] buffer;
 
   return crc;
 }
@@ -67,7 +67,7 @@ check_adler(Filename name) {
   unsigned long adler = adler32(0L, Z_NULL, 0);
   adler = adler32(adler, (unsigned char *)buffer, buffer_length);
 
-  delete buffer;
+  delete[] buffer;
 
   return adler;
 }
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPGWriter.cxx b/panda/src/pnmimagetypes/pnmFileTypeJPGWriter.cxx
index a73d1c415c..97964714fa 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPGWriter.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPGWriter.cxx
@@ -333,7 +333,7 @@ write_data(xel *array, xelval *) {
     row_pointer[0] = row;
     (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
   }
-  delete row;
+  delete[] row;
 
   /* Step 6: Finish compression */