diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-13 12:09:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-13 12:09:21 (GMT) |
| commit | a7a35f9dd069a28ee71c5b3c05293633a77c0f12 (patch) | |
| tree | bc481384d1bfa0258ec498009f7f2f9297e82f17 | |
| parent | f6e3461b2afc38d0ae86ecd6424de16e5b555ff4 (diff) | |
| parent | e30259f5920c3e4e6a6ff76d6c7d80bdbfd5ac32 (diff) | |
| download | tcl-a7a35f9dd069a28ee71c5b3c05293633a77c0f12.zip tcl-a7a35f9dd069a28ee71c5b3c05293633a77c0f12.tar.gz tcl-a7a35f9dd069a28ee71c5b3c05293633a77c0f12.tar.bz2 | |
Changelog entry, and change macro variable to not conflict with possible outside variable names
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tcl.h | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2012-12-13 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tcl.h: Fix Tcl_DecrRefCount macro such that it + doesn't access its objPtr parameter twice any more. + 2012-12-07 Jan Nijtmans <nijtmans@users.sf.net> * unix/dltest/pkgb.c: Turn pkgb.so into a Tcl9 interoperability test diff --git a/generic/tcl.h b/generic/tcl.h index b253db7..7a21590 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2313,9 +2313,9 @@ EXTERN void Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr)); */ # define Tcl_DecrRefCount(objPtr) \ do { \ - Tcl_Obj *obj = (objPtr); \ - if ((obj)->refCount-- < 2) { \ - TclFreeObj(obj); \ + Tcl_Obj *_objPtr = (objPtr); \ + if (_objPtr->refCount-- < 2) { \ + TclFreeObj(_objPtr); \ } \ } while(0) # define Tcl_IsShared(objPtr) \ |