From: Davidlohr Bueso <dave@xxxxxxx>
Date: Fri, 22 Oct 2010 12:22:56 -0300
Subject: [PATCH 2/7] more: use xalloc for memory allocation
Signed-off-by: Davidlohr Bueso <dave@xxxxxxx>
---
text-utils/more.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/text-utils/more.c b/text-utils/more.c
index 20efc28..3752059 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -36,6 +36,8 @@
libcurses (and hence can be in /bin with libcurses being in /usr/lib
which may not be mounted). However, when termcap is not present curses
can still be used.
+ 2010-10-21 Davidlohr Bueso <dave@xxxxxxx>
+ - modified mem allocation handling for util-linux-ng
*/
#include <stdio.h>
@@ -55,7 +57,9 @@
#include <sys/file.h>
#include <sys/wait.h>
#include "xstrncpy.h"
+
#include "nls.h"
+#include "xalloc.h"
#include "widechar.h"
#define _REGEX_RE_COMP
@@ -2015,22 +2019,14 @@ int expand (char **outbuf, char *inbuf) {
xtra = strlen (fnames[fnum]) + strlen (shell_line) + 1;
tempsz = 200 + xtra;
- temp = malloc(tempsz);
- if (!temp) {
- error (_("Out of memory"));
- return -1;
- }
+ temp = xmalloc(tempsz);
inpstr = inbuf;
outstr = temp;
while ((c = *inpstr++) != '\0'){
offset = outstr-temp;
if (tempsz-offset-1 < xtra) {
tempsz += 200 + xtra;
- temp = realloc(temp, tempsz);
- if (!temp) {
- error (_("Out of memory"));
- return -1;
- }
+ temp = xrealloc(temp, tempsz);
outstr = temp + offset;
}
switch (c) {
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
