From eda13bd1f08b0d206320f3c7629622393ad854ac Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Wed, 5 Aug 2015 00:10:58 +0100
Subject: [PATCH 1/2] Update codegen.pl too. See #1017

---
 modules/modpython/codegen.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
index 3a77b40d..e049d206 100755
--- a/modules/modpython/codegen.pl
+++ b/modules/modpython/codegen.pl
@@ -156,12 +156,12 @@ namespace {
 		return SWIG_TypeError;
 	}
 
-	inline int SWIG_AsPtr_std_string (PyObject * obj, CString **val) {
+	inline int SWIG_AsPtr_CString (PyObject * obj, CString **val) {
 		char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
 		if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) {
 			if (buf) {
 				if (val) *val = new CString(buf, size - 1);
-				if (alloc == SWIG_NEWOBJ) free((char*)buf);
+				if (alloc == SWIG_NEWOBJ) delete[] buf;
 				return SWIG_NEWOBJ;
 			} else {
 				if (val) *val = 0;
@@ -394,7 +394,7 @@ while (<$in>) {
 			}
 			when ('CString') {
 				say $out "\t\tCString* p = NULL;";
-				say $out "\t\tint res = SWIG_AsPtr_std_string(pyRes, &p);";
+				say $out "\t\tint res = SWIG_AsPtr_CString(pyRes, &p);";
 				say $out "\t\tif (!SWIG_IsOK(res)) {";
 				say $out "\t\t\tDEBUG(\"modpython: \" << (GetUser() ? GetUser()->GetUserName() : CString(\"<no user>\")) << \"/\" << GetModName() << \"/$name was expected to return '$type' but error=\" << res);";
 				say $out "\t\t\tresult = $default;";
@@ -402,7 +402,7 @@ while (<$in>) {
 				say $out "\t\t\tDEBUG(\"modpython: \" << (GetUser() ? GetUser()->GetUserName() : CString(\"<no user>\")) << \"/\" << GetModName() << \"/$name was expected to return '$type' but returned NULL\");";
 				say $out "\t\t\tresult = $default;";
 				say $out "\t\t} else result = *p;";
-				say $out "\t\tif (SWIG_IsNewObj(res)) free((char*)p); // Don't ask me, that's how SWIG works...";
+				say $out "\t\tif (SWIG_IsNewObj(res)) delete p;";
 			}
 			when ('CModule::EModRet') {
 				say $out "\t\tlong int x = PyLong_AsLong(pyRes);";

From 65e36c8daf3ae7b7d8ef990ae79befdb6d0669ed Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Wed, 5 Aug 2015 00:17:22 +0100
Subject: [PATCH 2/2] s/NULL/nullptr/ in modpython's codegen.pl

---
 modules/modpython/codegen.pl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
index e049d206..9b8e72c2 100755
--- a/modules/modpython/codegen.pl
+++ b/modules/modpython/codegen.pl
@@ -57,7 +57,7 @@ namespace {
 			m_sType = sType;
 		}
 		bool operator()(PyObject* py, T** result) {
-			T* x = NULL;
+			T* x = nullptr;
 			int res = SWIG_ConvertPtr(sv, (void**)&x, SWIG_TypeQuery(m_sType.c_str()), 0);
 			if (SWIG_IsOK(res)) {
 				*result = x;
@@ -218,7 +218,7 @@ bool OnFoo(const CString& x) {
 		Py_CLEAR(pyArg2);
 		return default;
 	}
-	PyObject* pyRes = PyObject_CallMethodObjArgs(m_pyObj, pyName, pyArg1, pyArg2, pyArg3, NULL);
+	PyObject* pyRes = PyObject_CallMethodObjArgs(m_pyObj, pyName, pyArg1, pyArg2, pyArg3, nullptr);
 	if (!pyRes) {
 		CString s = ...;
 		DEBUG("modpython: username/module/OnFoo failed: " << s);
@@ -253,7 +253,7 @@ while (<$in>) {
 			when ('bool')			 { $default = 'true' }
 			when ('CModule::EModRet') { $default = 'CONTINUE' }
 			when ('CString')		  { $default = '""' }
-			when (/\*$/)			  { $default = "($type)NULL" }
+			when (/\*$/)			  { $default = "($type)nullptr" }
 		}
 	}
 	my @arg = map {
@@ -367,7 +367,7 @@ while (<$in>) {
 
 	print $out "\tPyObject* pyRes = PyObject_CallMethodObjArgs(m_pyObj";
 	print $out ", $_->{pyvar}" for @arg;
-	say $out ", NULL);";
+	say $out ", nullptr);";
 	say $out "\tif (!pyRes) {";
 	say $out "\t\tCString sPyErr = m_pModPython->GetPyExceptionStr();";
 	say $out "\t\tDEBUG".'("modpython: " << (GetUser() ? GetUser()->GetUserName() : CString("<no user>")) << "/" << GetModName() << '."\"/$name failed: \" << sPyErr);";
@@ -393,13 +393,13 @@ while (<$in>) {
 				say $out "\t\t}";
 			}
 			when ('CString') {
-				say $out "\t\tCString* p = NULL;";
+				say $out "\t\tCString* p = nullptr;";
 				say $out "\t\tint res = SWIG_AsPtr_CString(pyRes, &p);";
 				say $out "\t\tif (!SWIG_IsOK(res)) {";
 				say $out "\t\t\tDEBUG(\"modpython: \" << (GetUser() ? GetUser()->GetUserName() : CString(\"<no user>\")) << \"/\" << GetModName() << \"/$name was expected to return '$type' but error=\" << res);";
 				say $out "\t\t\tresult = $default;";
 				say $out "\t\t} else if (!p) {";
-				say $out "\t\t\tDEBUG(\"modpython: \" << (GetUser() ? GetUser()->GetUserName() : CString(\"<no user>\")) << \"/\" << GetModName() << \"/$name was expected to return '$type' but returned NULL\");";
+				say $out "\t\t\tDEBUG(\"modpython: \" << (GetUser() ? GetUser()->GetUserName() : CString(\"<no user>\")) << \"/\" << GetModName() << \"/$name was expected to return '$type' but returned nullptr\");";
 				say $out "\t\t\tresult = $default;";
 				say $out "\t\t} else result = *p;";
 				say $out "\t\tif (SWIG_IsNewObj(res)) delete p;";