IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove OOM checks: alloc_cmdbuff()

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho 2014-05-10 00:50:47 -03:00
parent 1ca3368ce3
commit eb636858b5
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/ex_getln.c
View File

@ -232,8 +232,6 @@ getcmdline (
/* alloc initial ccline.cmdbuff */ /* alloc initial ccline.cmdbuff */
alloc_cmdbuff(exmode_active ? 250 : indent + 1); alloc_cmdbuff(exmode_active ? 250 : indent + 1);
if (ccline.cmdbuff == NULL)
return NULL; /* out of memory */
ccline.cmdlen = ccline.cmdpos = 0; ccline.cmdlen = ccline.cmdpos = 0;
ccline.cmdbuff[0] = NUL; ccline.cmdbuff[0] = NUL;
@ -1285,15 +1283,11 @@ getcmdline (
} }
if (i == 0) { if (i == 0) {
alloc_cmdbuff(len); alloc_cmdbuff(len);
if (ccline.cmdbuff == NULL)
goto returncmd;
} }
} }
ccline.cmdbuff[len] = NUL; ccline.cmdbuff[len] = NUL;
} else { } else {
alloc_cmdbuff((int)STRLEN(p)); alloc_cmdbuff((int)STRLEN(p));
if (ccline.cmdbuff == NULL)
goto returncmd;
STRCPY(ccline.cmdbuff, p); STRCPY(ccline.cmdbuff, p);
} }
@ -1999,7 +1993,6 @@ static void alloc_cmdbuff(int len)
/* /*
* Re-allocate the command line to length len + something extra. * Re-allocate the command line to length len + something extra.
* return FAIL for failure, OK otherwise
*/ */
static int realloc_cmdbuff(int len) static int realloc_cmdbuff(int len)
{ {
@ -2010,10 +2003,6 @@ static int realloc_cmdbuff(int len)
p = ccline.cmdbuff; p = ccline.cmdbuff;
alloc_cmdbuff(len); /* will get some more */ alloc_cmdbuff(len); /* will get some more */
if (ccline.cmdbuff == NULL) { /* out of memory */
ccline.cmdbuff = p; /* keep the old one */
return FAIL;
}
/* There isn't always a NUL after the command, but it may need to be /* There isn't always a NUL after the command, but it may need to be
* there, thus copy up to the NUL and add a NUL. */ * there, thus copy up to the NUL and add a NUL. */
memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen); memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen);