changed TclParseNumber to leave endPtrPtr on trailing whitespace

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 779cef2..6cd4d74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,8 @@
 	there was very poor test coverage in those areas.
 	* generic/tclParseExpr.c: Reworked parsing of numbers to call
 	TclParseNumber rather than trying to do things locally.
-	* generic/tclStrToD.c: Corrected a comment.
+	* generic/tclStrToD.c: Corrected a comment. Changed so that
+	*endPtrPtr does not include any trailing whitespace.
 	
 2005-08-17  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index d19270a..7333d4b 100755
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStrToD.c,v 1.1.2.20 2005/08/17 20:49:55 kennykb Exp $
+ * RCS: @(#) $Id: tclStrToD.c,v 1.1.2.21 2005/08/17 21:39:01 kennykb Exp $
  *
  *----------------------------------------------------------------------
  */
@@ -784,6 +784,10 @@ TclParseNumber( Tcl_Interp* interp,
 
     /* Skip past trailing whitespace */
 
+    if (endPtrPtr != NULL) {
+	*endPtrPtr = p;
+    }
+
     while (len > 0 && isspace(UCHAR(*p))) {
 	++p;
 	--len;
@@ -791,9 +795,7 @@ TclParseNumber( Tcl_Interp* interp,
 
     /* Determine whether a partial string is acceptable. */
 
-    if (endPtrPtr != NULL) {
-	*endPtrPtr = p;
-    } else if (len != 0 && *p != '\0') {
+    if (endPtrPtr == NULL && len != 0 && *p != '\0') {
 	status = TCL_ERROR;
     }