From d0a04da15e64d7bcf8fcec65ceae7c721c8c4ad2 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 6 Feb 2015 14:09:24 +0000 Subject: [a6c2807c13] Don't let forgotten slave trick us into layout computations outside the layout grid. --- generic/tkGrid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tkGrid.c b/generic/tkGrid.c index c6a00d5..ccdde19 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -1991,7 +1991,7 @@ ResolveConstraints( if (slavePtr->numCols > 1) { slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr; layoutPtr[rightEdge].binNextPtr = slavePtr; - } else { + } else if (rightEdge >= 0) { int size = slavePtr->size + layoutPtr[rightEdge].pad; if (size > layoutPtr[rightEdge].minSize) { @@ -2010,7 +2010,7 @@ ResolveConstraints( if (slavePtr->numRows > 1) { slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr; layoutPtr[rightEdge].binNextPtr = slavePtr; - } else { + } else if (rightEdge >= 0) { int size = slavePtr->size + layoutPtr[rightEdge].pad; if (size > layoutPtr[rightEdge].minSize) { -- cgit v0.12 From 17b49653f33040bd6d6c6471e93c5a4b8140bb7a Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 6 Feb 2015 15:44:23 +0000 Subject: [2b6778efe8] handle sscanf() EOF errors. --- generic/tkEntry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 816b7fa..6683cdc 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -1330,7 +1330,7 @@ ConfigureEntry( double dvalue; - if (sscanf(entryPtr->string, "%lf", &dvalue) == 0) { + if (sscanf(entryPtr->string, "%lf", &dvalue) <= 0) { /* Scan failure */ dvalue = sbPtr->fromValue; } else { @@ -4231,7 +4231,7 @@ SpinboxInvoke( } else if (!DOUBLES_EQ(sbPtr->fromValue, sbPtr->toValue)) { double dvalue; - if (sscanf(entryPtr->string, "%lf", &dvalue) == 0) { + if (sscanf(entryPtr->string, "%lf", &dvalue) <= 0) { /* * If the string doesn't scan as a double value, just * use the -from value -- cgit v0.12 From e9043031de3669be8a342498ecbc78cfdc67f054 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 6 Feb 2015 16:03:10 +0000 Subject: [c9535cd7ce] GetIndex() failed to route all successful exits through code that writes a result through the canCachePtr. --- generic/tkTextIndex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 70c94db..1b9d2a5 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -771,11 +771,11 @@ GetIndex( } if (TkTextWindowIndex(textPtr, string, indexPtr) != 0) { - return TCL_OK; + goto done; } if (TkTextImageIndex(textPtr, string, indexPtr) != 0) { - return TCL_OK; + goto done; } /* -- cgit v0.12