check for embedded \0 in strings for z and s formats

gvanrossum · gvanrossum · commit 96caaee83607 · 1992-08-14T15:12:03.000Z
diff --git a/Python/modsupport.c b/Python/modsupport.c
@@ -206,6 +206,10 @@ do_arg(arg, p_format, p_va)
 			*q = getstringsize(arg);
 			format++;
 		}
+		else if (strlen(*p) != getstringsize(arg)) {
+			err_setstr(ValueError, "embedded '\\0' in string arg");
+			return 0;
+		}
 		break;
 		}
 	
@@ -225,6 +229,10 @@ do_arg(arg, p_format, p_va)
 				*q = getstringsize(arg);
 			format++;
 		}
+		else if (*p != NULL && strlen(*p) != getstringsize(arg)) {
+			err_setstr(ValueError, "embedded '\\0' in string arg");
+			return 0;
+		}
 		break;
 		}
 	
@@ -292,8 +300,11 @@ int getargs(va_alist) va_dcl
 	va_end(va);
 	if (!ok) {
 		char buf[256];
-		sprintf(buf, "bad argument list (format '%s')", format);
-		err_setstr(TypeError, buf);
+		if (!err_occurred()) {
+			sprintf(buf, "bad argument list (format '%s')",
+				format);
+			err_setstr(TypeError, buf);
+		}
 	}
 	return ok;
 }

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,10 @@ do_arg(arg, p_format, p_va)`
`206`	`206`	`*q = getstringsize(arg);`
`207`	`207`	`format++;`
`208`	`208`	`}`
	`209`	`+ else if (strlen(*p) != getstringsize(arg)) {`
	`210`	`+ err_setstr(ValueError, "embedded '\\0' in string arg");`
	`211`	`+ return 0;`
	`212`	`+ }`
`209`	`213`	`break;`
`210`	`214`	`}`
`211`	`215`
`@@ -225,6 +229,10 @@ do_arg(arg, p_format, p_va)`
`225`	`229`	`*q = getstringsize(arg);`
`226`	`230`	`format++;`
`227`	`231`	`}`
	`232`	`+ else if (p != NULL && strlen(p) != getstringsize(arg)) {`
	`233`	`+ err_setstr(ValueError, "embedded '\\0' in string arg");`
	`234`	`+ return 0;`
	`235`	`+ }`
`228`	`236`	`break;`
`229`	`237`	`}`
`230`	`238`
`@@ -292,8 +300,11 @@ int getargs(va_alist) va_dcl`
`292`	`300`	`va_end(va);`
`293`	`301`	`if (!ok) {`
`294`	`302`	`char buf[256];`
`295`		`- sprintf(buf, "bad argument list (format '%s')", format);`
`296`		`- err_setstr(TypeError, buf);`
	`303`	`+ if (!err_occurred()) {`
	`304`	`+ sprintf(buf, "bad argument list (format '%s')",`
	`305`	`+ format);`
	`306`	`+ err_setstr(TypeError, buf);`
	`307`	`+ }`
`297`	`308`	`}`
`298`	`309`	`return ok;`
`299`	`310`	`}`