From dc9cf9cd6d48ad9c6e25427f958401adc4a913ac Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 8 Aug 2008 10:36:31 +0000 Subject: updated for version 7.2c-001 --- src/eval.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/eval.c') diff --git a/src/eval.c b/src/eval.c index cb548d30dc..5802a08940 100644 --- a/src/eval.c +++ b/src/eval.c @@ -6231,8 +6231,11 @@ list_extend(l1, l2, bef) listitem_T *bef; { listitem_T *item; + int todo = l2->lv_len; - for (item = l2->lv_first; item != NULL; item = item->li_next) + /* We also quit the loop when we have inserted the original item count of + * the list, avoid a hang when we extend a list with itself. */ + for (item = l2->lv_first; item != NULL && --todo >= 0; item = item->li_next) if (list_insert_tv(l1, &item->li_tv, bef) == FAIL) return FAIL; return OK; -- cgit v1.2.3