File array-delete.diff of Package konversation
diff -Nur ../konversation-1.1.orig/konversation/src/blowfish/mc_blowfish.cpp ./konversation/src/blowfish/mc_blowfish.cpp
--- ../konversation-1.1.orig/konversation/src/blowfish/mc_blowfish.cpp 2008-08-06 17:56:27.000000000 +0200
+++ ./konversation/src/blowfish/mc_blowfish.cpp 2008-11-13 17:25:46.000000000 +0100
@@ -54,7 +54,7 @@
char *cp2 = new char[strlen(cp)+15];
strcpy(cp2,"ERROR_NONCBC:");
strcat(cp2,cp);
- delete cp;
+ delete [] cp;
return cp2;
}
// invoke old ecb method
diff -Nur ../konversation-1.1.orig/konversation/src/blowfish/newblowfish.cpp ./konversation/src/blowfish/newblowfish.cpp
--- ../konversation-1.1.orig/konversation/src/blowfish/newblowfish.cpp 2008-08-06 17:56:27.000000000 +0200
+++ ./konversation/src/blowfish/newblowfish.cpp 2008-11-13 17:23:08.000000000 +0100
@@ -116,15 +116,15 @@
dest2=(char*)(spc_base64_encode((unsigned char*)dest,len,0));
if (dest2==0)
{
- delete s;
+ delete [] s;
return dest;
}
// now prefix a * to it while copying to dest and delete s
strcpy(dest,"*");
strcat(dest,dest2);
- delete dest2;
- delete s;
+ delete [] dest2;
+ delete [] s;
// return the dest (user will free)
return dest;
@@ -159,14 +159,14 @@
dest2=(char*)(spc_base64_decode((unsigned char*)s,&len,0,&err));
if (dest2==0)
{
- delete dest;
+ delete [] dest;
return s;
}
if (err)
{
// FOR TESTING:
// printf("ERROR IN BASE 64 decode!\n");
- delete dest;
+ delete [] dest;
return s;
}
@@ -184,7 +184,7 @@
dest3[len]='\0';
}
}
- delete dest2;
+ delete [] dest2;
// decrypt from dest3 (length len) to dest
CBlowFish oBlowFish((unsigned char*)key, strlen(key));
@@ -199,8 +199,8 @@
strcpy(dest,&dest[8]);
// delete s and dest3
- delete s;
- delete dest3;
+ delete [] s;
+ delete [] dest3;
// return dest
return dest;
diff -Nur ../konversation-1.1.orig/konversation/src/blowfish/oldblowfish.cpp ./konversation/src/blowfish/oldblowfish.cpp
--- ../konversation-1.1.orig/konversation/src/blowfish/oldblowfish.cpp 2008-08-06 17:56:27.000000000 +0200
+++ ./konversation/src/blowfish/oldblowfish.cpp 2008-11-13 17:25:14.000000000 +0100
@@ -37,7 +37,7 @@
oldCBlowFish::~oldCBlowFish ()
{
- delete PArray ;
+ delete [] PArray ;
delete [] SBoxes ;
}
@@ -378,7 +378,7 @@
}
}
*d = 0;
- delete s;
+ delete [] s;
return dest;
}
@@ -419,7 +419,7 @@
*d++ = (char) ((right & (0xff << ((3 - i) * 8))) >> ((3 - i) * 8));
}
*d = 0;
- delete s;
+ delete [] s;
return dest;
}
//---------------------------------------------------------------------------