mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 9.1.1564: crash when opening popup to closing buffer
Problem:  Can open a popup window to a closing buffer, leading to the
          buffer remaining open in the window after it's soon unloaded,
          causing crashes.
Solution: Check b_locked_split when opening a popup window to an
          existing buffer (Sean Dewar).
closes: #17790
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
			
			
This commit is contained in:
		
				
					committed by
					
						 Christian Brabandt
						Christian Brabandt
					
				
			
			
				
	
			
			
			
						parent
						
							be863b2633
						
					
				
				
					commit
					2e58b7684f
				
			| @@ -3742,3 +3742,7 @@ EXTERN char e_cannot_have_more_than_nr_diff_anchors[] | |||||||
| EXTERN char e_failed_to_find_all_diff_anchors[] | EXTERN char e_failed_to_find_all_diff_anchors[] | ||||||
| 	INIT(= N_("E1550: Failed to find all diff anchors")); | 	INIT(= N_("E1550: Failed to find all diff anchors")); | ||||||
| #endif | #endif | ||||||
|  | #ifdef FEAT_PROP_POPUP | ||||||
|  | EXTERN char e_cannot_open_a_popup_window_to_a_closing_buffer[] | ||||||
|  | 	INIT(= N_("E1551: Cannot open a popup window to a closing buffer")); | ||||||
|  | #endif | ||||||
|   | |||||||
							
								
								
									
										3065
									
								
								src/po/vim.pot
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3065
									
								
								src/po/vim.pot
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -2092,6 +2092,14 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type) | |||||||
|     else if (popup_is_notification(type)) |     else if (popup_is_notification(type)) | ||||||
| 	tabnr = -1;  // show on all tabs | 	tabnr = -1;  // show on all tabs | ||||||
|  |  | ||||||
|  |     if (buf != NULL && buf->b_locked_split) | ||||||
|  |     { | ||||||
|  | 	// disallow opening a popup to a closing buffer, which like splitting, | ||||||
|  | 	// can result in more windows displaying it | ||||||
|  | 	emsg(_(e_cannot_open_a_popup_window_to_a_closing_buffer)); | ||||||
|  | 	return NULL; | ||||||
|  |     } | ||||||
|  |  | ||||||
|     // Create the window and buffer. |     // Create the window and buffer. | ||||||
|     wp = win_alloc_popup_win(); |     wp = win_alloc_popup_win(); | ||||||
|     if (wp == NULL) |     if (wp == NULL) | ||||||
|   | |||||||
| @@ -4516,4 +4516,21 @@ func Test_popupwin_callback_closes_popupwin() | |||||||
|   call StopVimInTerminal(buf) |   call StopVimInTerminal(buf) | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
|  | func Test_popupwin_closing_buffer() | ||||||
|  |   augroup Test_popupwin_closing_buffer | ||||||
|  |     autocmd! | ||||||
|  |     autocmd BufWipeout * ++once | ||||||
|  |           \ call assert_fails('call popup_create(bufnr(), {})', 'E1551:') | ||||||
|  |   augroup END | ||||||
|  |  | ||||||
|  |   new | ||||||
|  |   setlocal bufhidden=wipe | ||||||
|  |   quit  " Popup window to closed buffer used to remain | ||||||
|  |   redraw!  " Would crash | ||||||
|  |  | ||||||
|  |   autocmd! Test_popupwin_closing_buffer | ||||||
|  |   augroup! Test_popupwin_closing_buffer | ||||||
|  |   %bd! | ||||||
|  | endfunc | ||||||
|  |  | ||||||
| " vim: shiftwidth=2 sts=2 | " vim: shiftwidth=2 sts=2 | ||||||
|   | |||||||
| @@ -719,6 +719,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     1564, | ||||||
| /**/ | /**/ | ||||||
|     1563, |     1563, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user