summaryrefslogtreecommitdiffstats
path: root/win/tkWinWm.c
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2003-12-09 13:43:35 (GMT)
committervincentdarley <vincentdarley>2003-12-09 13:43:35 (GMT)
commit67494e4c6046e688baae890e7c3e710f10a0f95e (patch)
tree9fc881a13f58d4f16310b793f1f27fe664b2d764 /win/tkWinWm.c
parent1485ba3f47705e8f8161ccf7ad9bc55f90814eec (diff)
downloadtk-67494e4c6046e688baae890e7c3e710f10a0f95e.zip
tk-67494e4c6046e688baae890e7c3e710f10a0f95e.tar.gz
tk-67494e4c6046e688baae890e7c3e710f10a0f95e.tar.bz2
fix to memory leaks and reading of freed memory
Diffstat (limited to 'win/tkWinWm.c')
-rw-r--r--win/tkWinWm.c38
1 files changed, 20 insertions, 18 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index edd91a2..57d823b 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.55 2003/03/12 00:25:42 mdejong Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.56 2003/12/09 13:43:35 vincentdarley Exp $
*/
#include "tkWinInt.h"
@@ -1466,44 +1466,36 @@ ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) {
ckfree( (char*)lpIR );
return NULL;
}
+ /* NULL-out everything to make memory management easier */
+ for( i = 0; i < lpIR->nNumImages; i++ ) {
+ lpIR->IconImages[i].lpBits = NULL;
+ }
/* Loop through and read in each image */
for( i = 0; i < lpIR->nNumImages; i++ ) {
/* Allocate memory for the resource */
lpIR->IconImages[i].lpBits = (LPBYTE) ckalloc(lpIDE[i].dwBytesInRes);
if (lpIR->IconImages[i].lpBits == NULL) {
Tcl_AppendResult(interp,"Error allocating memory",(char*)NULL);
- Tcl_Close(NULL, channel);
- ckfree( (char*)lpIR );
- ckfree( (char*)lpIDE );
- return NULL;
+ goto readError;
}
lpIR->IconImages[i].dwNumBytes = lpIDE[i].dwBytesInRes;
/* Seek to beginning of this image */
if (Tcl_Seek(channel, lpIDE[i].dwImageOffset, FILE_BEGIN) == -1) {
Tcl_AppendResult(interp,"Error seeking in file",(char*)NULL);
- Tcl_Close(NULL, channel);
- ckfree( (char*)lpIR );
- ckfree( (char*)lpIDE );
- return NULL;
+ goto readError;
}
/* Read it in */
dwBytesRead = Tcl_Read( channel, lpIR->IconImages[i].lpBits,
lpIDE[i].dwBytesInRes);
if (dwBytesRead != lpIDE[i].dwBytesInRes) {
Tcl_AppendResult(interp,"Error reading file",(char*)NULL);
- Tcl_Close(NULL, channel);
- ckfree( (char*)lpIDE );
- ckfree( (char*)lpIR );
- return NULL;
+ goto readError;
}
/* Set the internal pointers appropriately */
if (!AdjustIconImagePointers( &(lpIR->IconImages[i]))) {
Tcl_AppendResult(interp,"Error converting to internal format",
(char*)NULL);
- Tcl_Close(NULL, channel);
- ckfree( (char*)lpIDE );
- ckfree( (char*)lpIR );
- return NULL;
+ goto readError;
}
lpIR->IconImages[i].hIcon =
MakeIconOrCursorFromResource(&(lpIR->IconImages[i]), isIcon);
@@ -1513,10 +1505,20 @@ ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) {
Tcl_Close(NULL, channel);
if (lpIR == NULL){
Tcl_AppendResult(interp,"Reading of ", Tcl_GetString(fileName),
- " failed!",(char*)NULL);
+ " failed!",(char*)NULL);
return NULL;
}
return lpIR;
+ readError:
+ Tcl_Close(NULL, channel);
+ for( i = 0; i < lpIR->nNumImages; i++ ) {
+ if (lpIR->IconImages[i].lpBits != NULL) {
+ ckfree((char*)lpIR->IconImages[i].lpBits);
+ }
+ }
+ ckfree((char*)lpIDE );
+ ckfree((char*)lpIR );
+ return NULL;
}
/*