summaryrefslogtreecommitdiffstats
path: root/generic/tclScan.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2018-04-25 15:00:53 (GMT)
committerdgp <dgp@users.sourceforge.net>2018-04-25 15:00:53 (GMT)
commit13bcd282e3970b483fe00aa53e58ccf456d17bbc (patch)
tree4dbc707399a6e334148c8704fdf5b5450c204d3a /generic/tclScan.c
parent26e714137a987c67af5a932fdaf7bd1138d97a2d (diff)
parent859bcc9f868c96444e50001dac785edb3e889156 (diff)
downloadtcl-13bcd282e3970b483fe00aa53e58ccf456d17bbc.zip
tcl-13bcd282e3970b483fe00aa53e58ccf456d17bbc.tar.gz
tcl-13bcd282e3970b483fe00aa53e58ccf456d17bbc.tar.bz2
merge 8.7
Diffstat (limited to 'generic/tclScan.c')
-rw-r--r--generic/tclScan.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 113b4c6..0e3da17 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -941,11 +941,24 @@ Tcl_ScanObjCmd(
} else if (flags & SCAN_BIG) {
if (flags & SCAN_UNSIGNED) {
mp_int big;
- if ((Tcl_GetBignumFromObj(interp, objPtr, &big) != TCL_OK)
- || mp_isneg(&big)) {
+ int code = Tcl_GetBignumFromObj(interp, objPtr, &big);
+
+ if (code == TCL_OK) {
+ if (mp_isneg(&big)) {
+ code = TCL_ERROR;
+ }
+ mp_clear(&big);
+ }
+
+ if (code == TCL_ERROR) {
+ if (objs != NULL) {
+ ckfree(objs);
+ }
+ Tcl_DecrRefCount(objPtr);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unsigned bignum scans are invalid", -1));
- Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADUNSIGNED",NULL);
+ Tcl_SetErrorCode(interp, "TCL", "FORMAT",
+ "BADUNSIGNED",NULL);
return TCL_ERROR;
}
}