fix possible rare crash when Xutf8TextPropertyToTextList fails
from the XmbTextListToTextProperty(3) man page: "If insufficient memory is available for the new value string, the functions return XNoMemory. If the current locale is not supported, the functions return XLocaleNotSupported. In both of these error cases, the functions do not set text_prop_return." Reported by Steffen Nurpmeso <steffen@sdaoden.eu>, thanks!
This commit is contained in:
		
							parent
							
								
									1d3142da96
								
							
						
					
					
						commit
						2f6e597ed8
					
				
					 1 changed files with 6 additions and 4 deletions
				
			
		
							
								
								
									
										10
									
								
								x.c
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								x.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1588,8 +1588,9 @@ xseticontitle(char *p)
 | 
			
		|||
	XTextProperty prop;
 | 
			
		||||
	DEFAULT(p, opt_title);
 | 
			
		||||
 | 
			
		||||
	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 | 
			
		||||
			&prop);
 | 
			
		||||
	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 | 
			
		||||
	                                &prop) != Success)
 | 
			
		||||
		return;
 | 
			
		||||
	XSetWMIconName(xw.dpy, xw.win, &prop);
 | 
			
		||||
	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
 | 
			
		||||
	XFree(prop.value);
 | 
			
		||||
| 
						 | 
				
			
			@ -1601,8 +1602,9 @@ xsettitle(char *p)
 | 
			
		|||
	XTextProperty prop;
 | 
			
		||||
	DEFAULT(p, opt_title);
 | 
			
		||||
 | 
			
		||||
	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 | 
			
		||||
			&prop);
 | 
			
		||||
	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 | 
			
		||||
	                                &prop) != Success)
 | 
			
		||||
		return;
 | 
			
		||||
	XSetWMName(xw.dpy, xw.win, &prop);
 | 
			
		||||
	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
 | 
			
		||||
	XFree(prop.value);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue