backport patch [ 1300515 ] xdrlib.py: pack_fstring() did not use null bytes for padding

diff --git a/Lib/xdrlib.py b/Lib/xdrlib.py
index 112309036dcfa0b09d2f4de690e52eb0f0e41638..e13ae5c813e5fa67bffa4f42de10ddfe475cecee 100644 (file)
--- a/Lib/xdrlib.py
+++ b/Lib/xdrlib.py
@@ -79,8 +79,8 @@ class Packer:
     def pack_fstring(self, n, s):
         if n < 0:
             raise ValueError, 'fstring size must be nonnegative'
-        n = ((n+3)/4)*4
         data = s[:n]
+        n = ((n+3)/4)*4
         data = data + (n - len(data)) * '\0'
         self.__buf.write(data)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index d2088cd88cb6db55cca264014ccf3b101fc8445e..c2b32d822f8fcc710a727abc680daeff3ef60b33 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@ Extension Modules
 Library
 -------
 
+- Patch #1300515: xdrlib.py: Fix pack_fstring() to really use null bytes
+  for padding.
+
 - Bug #1296004: httplib.py: Limit maximal amount of data read from the
   socket to avoid a MemoryError on Windows.