diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-05-30 21:51:03 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-06-16 01:36:30 -0300 |
| commit | f7e64c3c5f70bf642f0ec7bec835f2827939abd7 (patch) | |
| tree | 51021294be11305b36e19a39ee14a4d8ceb2b0dc /src/nvim/syntax.c | |
| parent | d0fe14fdfe0b266a9d8b8da1bc1b12fc49e3c888 (diff) | |
| download | rneovim-f7e64c3c5f70bf642f0ec7bec835f2827939abd7.tar.gz rneovim-f7e64c3c5f70bf642f0ec7bec835f2827939abd7.tar.bz2 rneovim-f7e64c3c5f70bf642f0ec7bec835f2827939abd7.zip | |
No OOM in vim_strnsave_up()
And some cleanup in strsave_up()
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 6b4ab867f2..621c6f0d55 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -4399,10 +4399,6 @@ syn_cmd_region ( ++key_end; free(key); key = vim_strnsave_up(rest, (int)(key_end - rest)); - if (key == NULL) { /* out of memory */ - rest = NULL; - break; - } if (STRCMP(key, "MATCHGROUP") == 0) item = ITEM_MATCHGROUP; else if (STRCMP(key, "START") == 0) @@ -4692,12 +4688,8 @@ static void syn_combine_list(short **clstr1, short **clstr2, int list_op) */ static int syn_scl_name2id(char_u *name) { - char_u *name_u; - - /* Avoid using stricmp() too much, it's slow on some systems */ - name_u = vim_strsave_up(name); - if (name_u == NULL) - return 0; + // Avoid using stricmp() too much, it's slow on some systems + char_u *name_u = vim_strsave_up(name); int i; for (i = curwin->w_s->b_syn_clusters.ga_len; --i >= 0; ) { if (SYN_CLSTR(curwin->w_s)[i].scl_name_u != NULL |