summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-07-06 06:38:08 (GMT)
committerericm <ericm>2000-07-06 06:38:08 (GMT)
commit7f4db5c028c604a10b81401d983b383f65e2de83 (patch)
treeafa324f6aed427e947faa428bd4ef9f54d7d7960
parent8ea696f3623c8f3df9b570f448c1fefedf4ff750 (diff)
downloadtk-7f4db5c028c604a10b81401d983b383f65e2de83.zip
tk-7f4db5c028c604a10b81401d983b383f65e2de83.tar.gz
tk-7f4db5c028c604a10b81401d983b383f65e2de83.tar.bz2
Applied patch from Nijtmans/Howlett to intialize nextPtr field of TkCursor
structure when it is created, to prevent possible core dumps.
-rw-r--r--ChangeLog8
-rw-r--r--generic/tkCursor.c3
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e8ce33..df783c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,20 +7,24 @@
* win/tkWinColor.c (GetColorByName, GetColorByValue): Remove unused
function declarations.
* win/tkWinDialog.c (TrySetDirectory): Remove unused function declaration.
- * win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function prototype.
+ * win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function
+ prototype.
* win/tkWinMenu.c (winMenuMutex, MenuExitProc): Remove unused declaration.
* win/tkWinWindow.c (StackWindow): Remove unused declaration.
* win/tkWinWm.c (ConfigureEvent): Remove unused declaration.
* win/tkWinX.c (winXMutex): Remove unused declaration.
* xlib/ximage.c (XCreateBitmapFromData): Cast to match function prototype.
-2000-07-05 Eric Melski <ericm@scriptics.com>
+2000-07-05 Eric Melski <ericm@ajubasolutions.com>
* tests/imgPhoto.test: Added test for GIF writing code [Bug: 5823].
* generic/tkImgGIF.c: Applied patch from Jan Nijtmans to fix a
problem with the GIF writing code [Bug: 5823].
+ * generic/tkCursor.c: Added initialization for nextPtr field of TkCursor,
+ patch from Nijtmans/Howlett.
+
2000-07-05 Eric Melski <ericm@ajubasolutions.com>
* library/msgs/nl.msg: Dutch message catalog for dialogs, from Jan
diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index eab40e8..6bbbbf6 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCursor.c,v 1.5 2000/05/11 22:37:06 hobbs Exp $
+ * RCS: @(#) $Id: tkCursor.c,v 1.6 2000/07/06 06:38:09 ericm Exp $
*/
#include "tkPort.h"
@@ -276,6 +276,7 @@ GetCursor(interp, tkwin, string)
cursorPtr->objRefCount = 0;
cursorPtr->otherTable = &dispPtr->cursorNameTable;
cursorPtr->hashPtr = nameHashPtr;
+ cursorPtr->nextPtr = NULL;
cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable,
(char *) cursorPtr->cursor, &new);
if (!new) {