diff options
| author | das <das> | 2009-09-07 07:29:03 (GMT) |
|---|---|---|
| committer | das <das> | 2009-09-07 07:29:03 (GMT) |
| commit | b1a164c0a1f1822b82ed874aa176a5e3da80122e (patch) | |
| tree | 482f0c745521d3a4c67098b23132148476c35fbc /generic/tkFocus.c | |
| parent | 71419c7600e07b055614f65a8617ff25e63c1603 (diff) | |
| download | tk-b1a164c0a1f1822b82ed874aa176a5e3da80122e.zip tk-b1a164c0a1f1822b82ed874aa176a5e3da80122e.tar.gz tk-b1a164c0a1f1822b82ed874aa176a5e3da80122e.tar.bz2 | |
* generic/tkFocus.c: fix potential null dereference flagged by clang
* generic/tkMenu.c: static analyzer.
* generic/tkTextBTree.c:
* generic/tkTextDisp.c:
* generic/tkTextIndex.c:
* generic/tkConsole.c: silence false positives from clang static
* generic/tkTest.c: analyzer about potential null dereference.
* generic/tkText.c:
* generic/tkTextBTree.c:
* generic/tkTextTag.c:
* generic/tkVisual.c:
Diffstat (limited to 'generic/tkFocus.c')
| -rw-r--r-- | generic/tkFocus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkFocus.c b/generic/tkFocus.c index 1c8a682..622867c 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFocus.c,v 1.22 2009/07/22 05:35:38 dkf Exp $ + * RCS: @(#) $Id: tkFocus.c,v 1.23 2009/09/07 07:29:03 das Exp $ */ #include "tkInt.h" @@ -1177,7 +1177,7 @@ TkFocusJoin( tmpPtr = winPtr->mainPtr->tlFocusPtr; winPtr->mainPtr->tlFocusPtr = tmpPtr->nextPtr; ckfree((char *)tmpPtr); - } else { + } else if (winPtr && winPtr->mainPtr) { for (tlFocusPtr = winPtr->mainPtr->tlFocusPtr; tlFocusPtr != NULL; tlFocusPtr = tlFocusPtr->nextPtr) { if (tlFocusPtr->nextPtr && |