emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: fix places where we were still using malloc/realloc

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-01-08 09:07:50 +01:00
parent ef3817c6dc
commit 9037787eae
5 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editors/ed.c
View File

@@ -454,11 +454,7 @@ static void subCommand(const char *cmd, int num1, int num2)
* structure and use that. Link it in in place of
* the old line structure.
*/
nlp = malloc(sizeof(LINE) + lp->len + deltaLen);
if (nlp == NULL) {
bb_error_msg("can't get memory for line");
return;
}
nlp = xmalloc(sizeof(LINE) + lp->len + deltaLen);
nlp->len = lp->len + deltaLen;
@@ -712,12 +708,7 @@ static int readLines(const char *file, int num)
if (bufUsed >= bufSize) {
len = (bufSize * 3) / 2;
cp = realloc(bufBase, len);
if (cp == NULL) {
bb_error_msg("no memory for buffer");
close(fd);
return FALSE;
}
cp = xrealloc(bufBase, len);
bufBase = cp;
bufPtr = bufBase + bufUsed;
bufSize = len;
@@ -872,11 +863,7 @@ static int insertLine(int num, const char *data, int len)
return FALSE;
}
newLp = malloc(sizeof(LINE) + len - 1);
if (newLp == NULL) {
bb_error_msg("failed to allocate memory for line");
return FALSE;
}
newLp = xmalloc(sizeof(LINE) + len - 1);
memcpy(newLp->data, data, len);
newLp->len = len;

2
editors/sed.c
View File

@@ -1094,7 +1094,7 @@ static void process_files(void)
/* append next_line, read new next_line. */
}
len = strlen(pattern_space);
pattern_space = realloc(pattern_space, len + strlen(next_line) + 2);
pattern_space = xrealloc(pattern_space, len + strlen(next_line) + 2);
pattern_space[len] = '\n';
strcpy(pattern_space + len+1, next_line);
last_gets_char = next_gets_char;