| リビジョン | c6b06a4a8f928b1868a3d48d95293730262a041e (tree) |
|---|---|
| 日時 | 2008-07-27 22:57:29 |
| 作者 | vimboss |
| コミッター | vimboss |
updated for version 7.2b-023
src/eval.c (diff) src/version.c (diff)| @@ -1275,7 +1275,8 @@ | ||
| 1275 | 1275 | if (dolist && tv.v_type == VAR_LIST) |
| 1276 | 1276 | { |
| 1277 | 1277 | ga_init2(&ga, (int)sizeof(char), 80); |
| 1278 | - list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, 0); | |
| 1278 | + if (tv.vval.v_list != NULL) | |
| 1279 | + list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, 0); | |
| 1279 | 1280 | ga_append(&ga, NUL); |
| 1280 | 1281 | retval = (char_u *)ga.ga_data; |
| 1281 | 1282 | } |
| @@ -1380,6 +1381,7 @@ | ||
| 1380 | 1381 | /* |
| 1381 | 1382 | * Evaluate an expression to a list with suggestions. |
| 1382 | 1383 | * For the "expr:" part of 'spellsuggest'. |
| 1384 | + * Returns NULL when there is an error. | |
| 1383 | 1385 | */ |
| 1384 | 1386 | list_T * |
| 1385 | 1387 | eval_spell_expr(badword, expr) |
| @@ -1587,8 +1589,9 @@ | ||
| 1587 | 1589 | # endif |
| 1588 | 1590 | |
| 1589 | 1591 | /* |
| 1590 | - * Call vimL function "func" and return the result as a list | |
| 1592 | + * Call vimL function "func" and return the result as a List. | |
| 1591 | 1593 | * Uses argv[argc] for the function arguments. |
| 1594 | + * Returns NULL when there is something wrong. | |
| 1592 | 1595 | */ |
| 1593 | 1596 | void * |
| 1594 | 1597 | call_func_retlist(func, argc, argv, safe) |
| @@ -5817,6 +5820,8 @@ | ||
| 5817 | 5820 | { |
| 5818 | 5821 | listitem_T *item1, *item2; |
| 5819 | 5822 | |
| 5823 | + if (l1 == NULL || l2 == NULL) | |
| 5824 | + return FALSE; | |
| 5820 | 5825 | if (l1 == l2) |
| 5821 | 5826 | return TRUE; |
| 5822 | 5827 | if (list_len(l1) != list_len(l2)) |
| @@ -5855,6 +5860,8 @@ | ||
| 5855 | 5860 | dictitem_T *item2; |
| 5856 | 5861 | int todo; |
| 5857 | 5862 | |
| 5863 | + if (d1 == NULL || d2 == NULL) | |
| 5864 | + return FALSE; | |
| 5858 | 5865 | if (d1 == d2) |
| 5859 | 5866 | return TRUE; |
| 5860 | 5867 | if (dict_len(d1) != dict_len(d2)) |
| @@ -6243,6 +6250,9 @@ | ||
| 6243 | 6250 | { |
| 6244 | 6251 | list_T *l; |
| 6245 | 6252 | |
| 6253 | + if (l1 == NULL || l2 == NULL) | |
| 6254 | + return FAIL; | |
| 6255 | + | |
| 6246 | 6256 | /* make a copy of the first list. */ |
| 6247 | 6257 | l = list_copy(l1, FALSE, 0); |
| 6248 | 6258 | if (l == NULL) |
| @@ -677,6 +677,8 @@ | ||
| 677 | 677 | static int included_patches[] = |
| 678 | 678 | { /* Add new patch number below this line */ |
| 679 | 679 | /**/ |
| 680 | + 23, | |
| 681 | +/**/ | |
| 680 | 682 | 22, |
| 681 | 683 | /**/ |
| 682 | 684 | 21, |
Vim
Fork