Backport fixes for bugs #1086555 and #1085744.

Misc/NEWS

@@ -37,6 +37,11 @@ What's New in Python 2.4 final?
 Core and builtins
 -----------------
 
+- Bug #1086555:  Fix leak in syslog module.
+
+- Bug #1085744:  Add missing overflow check to PySequence_Tuple().
+  Make resize schedule linear (amortized).
+
 - Bug 875692: Improve signal handling, especially when using threads, by
   forcing an early re-execution of PyEval_EvalFrame() "periodic" code when
   things_to_do is not cleared by Py_MakePendingCalls().

Modules/syslogmodule.c

@@ -57,17 +57,18 @@ syslog_openlog(PyObject * self, PyObject * args)
 {
 	long logopt = 0;
 	long facility = LOG_USER;
+	PyObject *new_S_ident_o;
 
-
-	Py_XDECREF(S_ident_o);
 	if (!PyArg_ParseTuple(args,
 			      "S|ll;ident string [, logoption [, facility]]",
-			      &S_ident_o, &logopt, &facility))
+			      &new_S_ident_o, &logopt, &facility))
 		return NULL;
 
 	/* This is needed because openlog() does NOT make a copy
 	 * and syslog() later uses it.. cannot trash it.
 	 */
+	Py_XDECREF(S_ident_o);
+	S_ident_o = new_S_ident_o;
 	Py_INCREF(S_ident_o);
 
 	openlog(PyString_AsString(S_ident_o), logopt, facility);

Objects/abstract.c

@@ -1427,10 +1427,15 @@ PySequence_Tuple(PyObject *v)
 			break;
 		}
 		if (j >= n) {
-			if (n < 500)
-				n += 10;
-			else
-				n += 100;
+			int oldn = n;
+			n += 10;
+			n += n >> 2;
+			if (n < oldn) {
+				/* Check for overflow */
+				PyErr_NoMemory();
+				Py_DECREF(item);
+				goto Fail; 
+			}
 			if (_PyTuple_Resize(&result, n) != 0) {
 				Py_DECREF(item);
 				goto Fail;