mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	#1782: don't leak in error case in PyModule_AddXxxConstant. Patch by Hrvoje Nikšić.
This commit is contained in:
		
							parent
							
								
									6ebc52749c
								
							
						
					
					
						commit
						c211a0a00b
					
				
					 1 changed files with 14 additions and 2 deletions
				
			
		| 
						 | 
					@ -621,11 +621,23 @@ PyModule_AddObject(PyObject *m, const char *name, PyObject *o)
 | 
				
			||||||
int 
 | 
					int 
 | 
				
			||||||
PyModule_AddIntConstant(PyObject *m, const char *name, long value)
 | 
					PyModule_AddIntConstant(PyObject *m, const char *name, long value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return PyModule_AddObject(m, name, PyInt_FromLong(value));
 | 
						PyObject *o = PyInt_FromLong(value);
 | 
				
			||||||
 | 
						if (!o)
 | 
				
			||||||
 | 
							return -1;
 | 
				
			||||||
 | 
						if (PyModule_AddObject(m, name, o) == 0)
 | 
				
			||||||
 | 
							return 0;
 | 
				
			||||||
 | 
						Py_DECREF(o);
 | 
				
			||||||
 | 
						return -1;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int 
 | 
					int 
 | 
				
			||||||
PyModule_AddStringConstant(PyObject *m, const char *name, const char *value)
 | 
					PyModule_AddStringConstant(PyObject *m, const char *name, const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return PyModule_AddObject(m, name, PyString_FromString(value));
 | 
						PyObject *o = PyString_FromString(value);
 | 
				
			||||||
 | 
						if (!o)
 | 
				
			||||||
 | 
							return -1;
 | 
				
			||||||
 | 
						if (PyModule_AddObject(m, name, o) == 0)
 | 
				
			||||||
 | 
							return 0;
 | 
				
			||||||
 | 
						Py_DECREF(o);
 | 
				
			||||||
 | 
						return -1;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue