Blame grep-2.5.3-mem-exhausted.patch
|
Lubomir Rintel |
0efa5e |
From 3e85874b1ea00d395a2add6b1cf38eef34bc2c38 Mon Sep 17 00:00:00 2001
|
|
Lubomir Rintel |
0efa5e |
From: Tim Waugh <twaugh@redhat.com>
|
|
Lubomir Rintel |
0efa5e |
Date: Sun, 23 Nov 2008 17:54:33 +0100
|
|
Lubomir Rintel |
0efa5e |
Subject: [PATCH] Limit in-memory buffer size
|
|
Lubomir Rintel |
0efa5e |
|
|
Lubomir Rintel |
0efa5e |
Limit the amount of saved data to 200Mb so we don't fail on
|
|
Lubomir Rintel |
0efa5e |
large files.
|
|
Lubomir Rintel |
0efa5e |
|
|
Lubomir Rintel |
0efa5e |
Original ticket: https://bugzilla.redhat.com/show_bug.cgi?id=198165
|
|
Lubomir Rintel |
0efa5e |
---
|
|
Lubomir Rintel |
0efa5e |
src/grep.c | 6 ++++++
|
|
Lubomir Rintel |
0efa5e |
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
Lubomir Rintel |
0efa5e |
|
|
Lubomir Rintel |
0efa5e |
diff --git a/src/grep.c b/src/grep.c
|
|
Lubomir Rintel |
0efa5e |
index 4363b4a..46ce140 100644
|
|
Lubomir Rintel |
0efa5e |
--- a/src/grep.c
|
|
Lubomir Rintel |
0efa5e |
+++ b/src/grep.c
|
|
Lubomir Rintel |
0efa5e |
@@ -492,6 +492,12 @@ fillbuf (size_t save, struct stats const *stats)
|
|
Tim Waugh |
169765 |
int cc = 1;
|
|
Tim Waugh |
169765 |
char *readbuf;
|
|
Tim Waugh |
169765 |
size_t readsize;
|
|
Tim Waugh |
169765 |
+ const size_t max_save = 200 * 1024 * 1024;
|
|
Tim Waugh |
169765 |
+
|
|
Tim Waugh |
169765 |
+ /* Limit the amount of saved data to 200Mb so we don't fail on
|
|
Tim Waugh |
169765 |
+ * large files. */
|
|
Tim Waugh |
169765 |
+ if (save > max_save)
|
|
Tim Waugh |
169765 |
+ save = max_save;
|
|
Tim Waugh |
169765 |
|
|
Tim Waugh |
169765 |
/* Offset from start of buffer to start of old stuff
|
|
Tim Waugh |
169765 |
that we want to save. */
|
|
Lubomir Rintel |
0efa5e |
--
|
|
Lubomir Rintel |
0efa5e |
1.5.5.1
|
|
Lubomir Rintel |
0efa5e |
|