diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-05-31 00:43:57 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-06-16 01:40:27 -0300 |
| commit | b1595e74f2811b8fb5f04aa14ef80dbe3b69ae73 (patch) | |
| tree | 903069f793f2768a2f3901919919cd73a9e6478c /src | |
| parent | 85100bb01dfebabf4b2557fd6d8a6041f83b0a76 (diff) | |
| download | rneovim-b1595e74f2811b8fb5f04aa14ef80dbe3b69ae73.tar.gz rneovim-b1595e74f2811b8fb5f04aa14ef80dbe3b69ae73.tar.bz2 rneovim-b1595e74f2811b8fb5f04aa14ef80dbe3b69ae73.zip | |
No OOM in reverse_text()
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/search.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index f4b034d3f6..ee81f6c851 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -23,6 +23,7 @@ #include "nvim/farsi.h" #include "nvim/fileio.h" #include "nvim/fold.h" +#include "nvim/func_attr.h" #include "nvim/getchar.h" #include "nvim/indent.h" #include "nvim/main.h" @@ -177,15 +178,8 @@ search_regcomp ( } if (curwin->w_p_rl && *curwin->w_p_rlc == 's') { - char_u *rev_pattern; - - rev_pattern = reverse_text(pat); - if (rev_pattern == NULL) - mr_pattern = pat; /* out of memory, keep normal pattern. */ - else { - mr_pattern = rev_pattern; - mr_pattern_alloced = TRUE; - } + mr_pattern = reverse_text(pat); + mr_pattern_alloced = TRUE; } else mr_pattern = pat; @@ -224,7 +218,7 @@ char_u *get_search_pat(void) * * TODO(philix): move reverse_text() to strings.c */ -char_u *reverse_text(char_u *s) +char_u *reverse_text(char_u *s) FUNC_ATTR_NONNULL_RET { /* * Reverse the pattern. |