Merge pull request #1679 from oni-link/fix.clang.warning

Fix for clang analyzer warning in ops.c
This commit is contained in:
Justin M. Keyes 2014-12-15 16:03:20 -05:00
commit 3a61b84543

View File

@ -4483,10 +4483,7 @@ int read_viminfo_register(vir_T *virp, int force)
if (set_prev) if (set_prev)
y_previous = y_current; y_previous = y_current;
for (int i = 0; i < y_current->y_size; i++) { free_yank_all();
free(y_current->y_array[i]);
}
free(y_current->y_array);
array = xmalloc(limit * sizeof(char_u *)); array = xmalloc(limit * sizeof(char_u *));
str = skipwhite(skiptowhite(str)); str = skipwhite(skiptowhite(str));
@ -4515,7 +4512,6 @@ int read_viminfo_register(vir_T *virp, int force)
if (do_it) { if (do_it) {
if (size == 0) { if (size == 0) {
free(array); free(array);
y_current->y_array = NULL;
} else if (size < limit) { } else if (size < limit) {
y_current->y_array = xrealloc(array, size * sizeof(char_u *)); y_current->y_array = xrealloc(array, size * sizeof(char_u *));
} else { } else {