summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2010-01-24 18:16:29 -0800
committerKaz Kylheku <kaz@kylheku.com>2010-01-24 18:16:29 -0800
commitc7e42d7f1a4d7bea93090c826e7cf5de19c3061b (patch)
treea14ec65734e0fa9eb770b6ebf9b9431c7ceed5a0
parent64b09cd68e003f3f1c1b71284aceb90b9c236f05 (diff)
downloadtxr-c7e42d7f1a4d7bea93090c826e7cf5de19c3061b.tar.gz
txr-c7e42d7f1a4d7bea93090c826e7cf5de19c3061b.tar.bz2
txr-c7e42d7f1a4d7bea93090c826e7cf5de19c3061b.zip
* stream.c (vformat_num): Fix bad width calculation.
-rw-r--r--ChangeLog4
-rw-r--r--stream.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9871e1a4..695e17a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-24 Kaz Kylheku <kkylheku@gmail.com>
+
+ * stream.c (vformat_num): Fix bad width calculation.
+
2010-01-21 Kaz Kylheku <kkylheku@gmail.com>
Fix for unbounded memory growth problem reproduced with GCC 4.4.1
diff --git a/stream.c b/stream.c
index 5f93209b..97934867 100644
--- a/stream.c
+++ b/stream.c
@@ -651,7 +651,7 @@ static val vformat_num(val stream, const char *str,
int width, int left, int pad, int precision)
{
int len = strlen(str);
- int truewidth = (width < precision) ? width : precision;
+ int truewidth = (width > precision) ? width : precision;
int slack = (len < truewidth) ? truewidth - len : 0;
int padlen = (len < precision) ? precision - len : 0;
int i;