XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant check for NULL in char * typemaps 

No need to check for NULL before calling delete/free.
Anyone using typemaps_string_alloc with custom allocators and
deallocators need to ensure the custom allocators behave in the
same way as the standard deallocators in this respect.
This commit is contained in:
William S Fulton 2022-07-24 10:57:36 +01:00
parent 0e0f283e48
commit 5a4baece4f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/typemaps/strings.swg
View File

@ -79,7 +79,7 @@
if (!SWIG_IsOK(res)) {
%variable_fail(res,"$type","$name");
}
if ($1) SWIG_DeleteCharArray($1);
SWIG_DeleteCharArray($1);
if (alloc == SWIG_NEWOBJ) {
$1 = cptr;
} else {
@ -109,7 +109,7 @@
/* memberin */
%typemap(memberin,noblock=1) Char * {
if ($1) SWIG_DeleteCharArray($1);
SWIG_DeleteCharArray($1);
if ($input) {
size_t size = SWIG_CharPtrLen(%reinterpret_cast($input, const Char *)) + 1;
$1 = ($1_type)SWIG_NewCopyCharArray(%reinterpret_cast($input, const Char *), size, Char);
@ -130,7 +130,7 @@
/* globalin */
%typemap(globalin,noblock=1) Char * {
if ($1) SWIG_DeleteCharArray($1);
SWIG_DeleteCharArray($1);
if ($input) {
size_t size = SWIG_CharPtrLen(%reinterpret_cast(%reinterpret_cast($input, const Char *), const Char *)) + 1;
$1 = ($1_type)SWIG_NewCopyCharArray($input, size, Char);