mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 03:44:55 +00:00 
			
		
		
		
	merge 3.3
This commit is contained in:
		
						commit
						cb2226cb69
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
					@ -254,9 +254,10 @@ get_coding_spec(const char *s, char **spec, Py_ssize_t size, struct tok_state *t
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (begin < t) {
 | 
					            if (begin < t) {
 | 
				
			||||||
                char* r = new_string(begin, t - begin, tok);
 | 
					                char* r = new_string(begin, t - begin, tok);
 | 
				
			||||||
 | 
					                char* q;
 | 
				
			||||||
                if (!r)
 | 
					                if (!r)
 | 
				
			||||||
                    return 0;
 | 
					                    return 0;
 | 
				
			||||||
                char* q = get_normal_name(r);
 | 
					                q = get_normal_name(r);
 | 
				
			||||||
                if (r != q) {
 | 
					                if (r != q) {
 | 
				
			||||||
                    PyMem_FREE(r);
 | 
					                    PyMem_FREE(r);
 | 
				
			||||||
                    r = new_string(q, strlen(q), tok);
 | 
					                    r = new_string(q, strlen(q), tok);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue