blob: 6c27517617e3f64c3d0595dde54c013c95e42a94 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 478effbfd9c3cc5a627fc671d4bf94d13670d65f Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 27 Sep 2019 12:21:49 +0100
Subject: [PATCH] Fix buffer overflow in string_vformat. Bug 2449
---
src/string.c | 4 ++--
test/scripts/0000-Basic/0214 | 11 +++++++++++
test/stdout/0214 | 7 +++++++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/string.c b/src/string.c
index c6549bf93..3445f8a42 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1132,7 +1132,7 @@ store_reset(g->s + (g->size = g->ptr + 1));
Arguments:
g the growable-string
p current end of data
- count amount to grow by
+ count amount to grow by, offset from p
*/
static void
@@ -1590,7 +1590,7 @@ while (*fp)
}
else if (g->ptr >= lim - width)
{
- gstring_grow(g, g->ptr, width - (lim - g->ptr));
+ gstring_grow(g, g->ptr, width);
lim = g->size - 1;
gp = CS g->s + g->ptr;
}
--
2.23.0
|
