From 6255e812dcf06a66bbf225ab841f1a2844799236 Mon Sep 17 00:00:00 2001
From: Kevin Ryde <user42@zip.com.au>
Date: Wed, 8 Dec 2004 22:56:52 +0000
Subject: [PATCH] *** empty log message ***

---
 NEWS               |  6 ++++++
 libguile/ChangeLog | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/NEWS b/NEWS
index 6736f62f3..6453b5d71 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,12 @@ Changes since Guile 1.6.6 (changes in 1.6.7):
 
 * Changes to Scheme functions and syntax
 
+** string->number and octal constant bignums
+
+An incorrect bignum size calculation has been fixed, this caused
+overflow errors in string->number on bases other than 2, 10 and 16,
+including octal literal constants in code or the reader.
+
 ** SRFI-1 alist-delete equality argument order fixed.
 
 In the srfi-1 module alist-delete and alist-delete!, the order of the
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index cbc0d5dfa..96a184ed8 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,18 @@
+2004-12-09  Kevin Ryde  <user42@zip.com.au>
+
+	* numbers.c (scm_istr2int): Correction to overflow test, should be
+	"blen >= j" not "blen > j", since after blen++ the k<blen loop will
+	have k==j which is past the end of the j length array and overwrites
+	data, leading to segvs in certain circumstances.  And put the test
+	only before the blen++, which is the only place it can overflow, and
+	since we can legitimately get to blen==j with t2==0 when filling the
+	high word of the bignum.
+
+	* numbers.c (scm_istr2int): Correction to bignum size calculation for
+	bases other than 2, 10, 16.  This avoids overflows, in particular in
+	octal string->number and constants (other bases are undocumented, but
+	reach here so may as well work).
+
 2004-12-02  Kevin Ryde  <user42@zip.com.au>
 
 	* posix.c (scm_execle): Correction to memory leak change, need to