Mercurial > vim
changeset 31408:c82cb53474ee v9.0.1037
patch 9.0.1037: lalloc(0) error for a class without members
Commit: https://github.com/vim/vim/commit/98aeb2100c2759111f93f0f0857e93d98afdc88a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 8 22:09:14 2022 +0000
patch 9.0.1037: lalloc(0) error for a class without members
Problem: lalloc(0) error for a class without members.
Solution: Don't allocate room for members if there aren't any.
Don't create the class if there was an error.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 08 Dec 2022 23:15:03 +0100 |
| parents | 9b7fe85ab47f |
| children | e9572de53c6d |
| files | src/version.c src/vim9class.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1037, +/**/ 1036, /**/ 1035,
--- a/src/vim9class.c +++ b/src/vim9class.c @@ -121,8 +121,8 @@ ex_class(exarg_T *eap) semsg(_(e_command_cannot_be_shortened_str), line); else if (*p == '|' || !ends_excmd2(line, p)) semsg(_(e_trailing_characters_str), p); - - success = TRUE; + else + success = TRUE; break; } @@ -190,9 +190,10 @@ ex_class(exarg_T *eap) // Members are used by the new() function, add them here. cl->class_obj_member_count = objmembers.ga_len; - cl->class_obj_members = ALLOC_MULT(objmember_T, objmembers.ga_len); + cl->class_obj_members = objmembers.ga_len == 0 ? NULL + : ALLOC_MULT(objmember_T, objmembers.ga_len); if (cl->class_name == NULL - || cl->class_obj_members == NULL) + || (objmembers.ga_len > 0 && cl->class_obj_members == NULL)) { vim_free(cl->class_name); vim_free(cl->class_obj_members);