mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 06:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

No OOM in vim_strnsave_up()

Browse Source 
And some cleanup in strsave_up()
This commit is contained in:
Felipe Oliveira Carvalho
2014-05-30 21:51:03 -03:00
parent d0fe14fdfe
commit f7e64c3c5f
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/strings.c
View File

@@ -13,6 +13,7 @@
#include "nvim/ex_docmd.h"
#include "nvim/ex_getln.h"
#include "nvim/fileio.h"
#include "nvim/func_attr.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
#include "nvim/mark.h"
@@ -214,11 +215,9 @@ char_u *vim_strsave_up(char_u *string)
* Like vim_strnsave(), but make all characters uppercase.
* This uses ASCII lower-to-upper case translation, language independent.
*/
char_u *vim_strnsave_up(char_u *string, int len)
char_u *vim_strnsave_up(char_u *string, int len) FUNC_ATTR_NONNULL_RET
{
char_u *p1;
p1 = vim_strnsave(string, len);
char_u *p1 = vim_strnsave(string, len);
vim_strup(p1);
return p1;
}
@@ -251,19 +250,16 @@ char_u *strup_save(char_u *orig)
int l;
if (enc_utf8) {
int c, uc;
int newl;
char_u *s;
c = utf_ptr2char(p);
uc = utf_toupper(c);
int c = utf_ptr2char(p);
int uc = utf_toupper(c);
/* Reallocate string when byte count changes. This is rare,
* thus it's OK to do another malloc()/free(). */
l = utf_ptr2len(p);
newl = utf_char2len(uc);
int newl = utf_char2len(uc);
if (newl != l) {
s = xmalloc(STRLEN(res) + 1 + newl - l);
// TODO(philix): use xrealloc() in strup_save()
char_u *s = xmalloc(STRLEN(res) + 1 + newl - l);
memmove(s, res, p - res);
STRCPY(s + (p - res) + newl, p + l);
p = s + (p - res);