From 4c1d56db0ef7325c1817833b5f178dd393fb54e9 Mon Sep 17 00:00:00 2001
From: Miguel Sofer <miguel.sofer@gmail.com>
Date: Thu, 28 Sep 2006 19:24:51 +0000
Subject: 	* generic/tclIO.c (Tcl_GetsObj): added two test'n'panic guards
 for 	possible NULL derefs, [Bug 1566382] and coverity #33.

---
 ChangeLog       | 5 +++++
 generic/tclIO.c | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 043edd9..a5cee9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-28  Miguel Sofer  <msofer@users.sf.net>
+
+	* generic/tclIO.c (Tcl_GetsObj): added two test'n'panic guards for
+	possible NULL derefs, [Bug 1566382] and coverity #33.
+
 2006-09-27  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclPkg.c (CompareVersion):	Flatten strcmp() results to
diff --git a/generic/tclIO.c b/generic/tclIO.c
index f0553dd..689447b 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIO.c,v 1.108 2006/09/25 21:55:27 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.109 2006/09/28 19:24:52 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -3995,6 +3995,9 @@ Tcl_GetsObj(
 
   gotEOL:
     bufPtr = gs.bufPtr;
+    if (bufPtr == NULL) {
+	Tcl_Panic("Tcl_GetsObj: gotEOL reached with bufPtr==NULL");
+    }
     statePtr->inputEncodingState = gs.state;
     Tcl_ExternalToUtf(NULL, gs.encoding, bufPtr->buf + bufPtr->nextRemoved,
 	    gs.rawRead, statePtr->inputEncodingFlags,
@@ -4021,6 +4024,9 @@ Tcl_GetsObj(
 
   restore:
     bufPtr = statePtr->inQueueHead;
+    if (bufPtr == NULL) {
+	Tcl_Panic("Tcl_GetsObj: restore reached with bufPtr==NULL");
+    }
     bufPtr->nextRemoved = oldRemoved;
 
     for (bufPtr = bufPtr->nextPtr; bufPtr != NULL; bufPtr = bufPtr->nextPtr) {
-- 
cgit v0.12