@@ -31,130 +31,3 @@ index 0837a4a4991e..39ba030b5191 100644

  static DWORD (CALLBACK *Py_CreateSymbolicLinkA)(LPSTR, LPSTR, DWORD) = NULL;

  static int

-@@ -7259,18 +7259,24 @@ check_CreateSymbolicLink(void)

-     return (Py_CreateSymbolicLinkW && Py_CreateSymbolicLinkA);

- }

- 

--/* Remove the last portion of the path */

--static void

-+/* Remove the last portion of the path - return 0 on success */

-+static int

- _dirnameW(WCHAR *path)

- {

-     WCHAR *ptr;

- 

-+    size_t length = wcsnlen_s(path, MAX_PATH);

-+    if (length == MAX_PATH) {

-+        return -1;

-+    }

-     /* walk the path from the end until a backslash is encountered */

--    for(ptr = path + wcslen(path); ptr != path; ptr--) {

--        if (*ptr == L'\\' || *ptr == L'/')

-+    for(ptr = path + length; ptr != path; ptr--) {

-+        if (*ptr == L'\\' || *ptr == L'/'){

-             break;

-+   }

-     }

-     *ptr = 0;

-+    return 0;

- }

- 

- /* Remove the last portion of the path */

-@@ -7299,29 +7305,26 @@ _is_absW(const WCHAR *path)

- static int

- _is_absA(const char *path)

- {

--    return path[0] == '\\' || path[0] == '/' || path[1] == ':';

--

-+    return path[0] == L'\\' || path[0] == L'/' ||

-+        (path[0] && path[1] == L':');

- }

- 

--/* join root and rest with a backslash */

--static void

-+/* join root and rest with a backslash - return 0 on success */

-+static int

- _joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest)

- {

--    size_t root_len;

--

-     if (_is_absW(rest)) {

--        wcscpy(dest_path, rest);

--        return;

-+        return wcscpy_s(dest_path, MAX_PATH, rest);

-     }

- 

--    root_len = wcslen(root);

--

--    wcscpy(dest_path, root);

--    if(root_len) {

--        dest_path[root_len] = L'\\';

--        root_len++;

-+    if (wcscpy_s(dest_path, MAX_PATH, root)) {

-+        return -1;

-     }

--    wcscpy(dest_path+root_len, rest);

-+

-+    if (dest_path[0] && wcscat_s(dest_path, MAX_PATH, L"\\")) {

-+        return -1;

-+     }

-+    return wcscat_s(dest_path, MAX_PATH, rest);

- }

- 

- /* join root and rest with a backslash */

-@@ -7354,10 +7357,14 @@ _check_dirW(WCHAR *src, WCHAR *dest)

-     WCHAR src_resolved[MAX_PATH] = L"";

- 

-     /* dest_parent = os.path.dirname(dest) */

--    wcscpy(dest_parent, dest);

--    _dirnameW(dest_parent);

-+    if (wcscpy_s(dest_parent, MAX_PATH, dest) ||

-+        _dirnameW(dest_parent)) {

-+        return 0;

-+    }

-     /* src_resolved = os.path.join(dest_parent, src) */

--    _joinW(src_resolved, dest_parent, src);

-+    if (_joinW(src_resolved, dest_parent, src)) {

-+        return 0;

-+    }

-     return (

-         GetFileAttributesExW(src_resolved, GetFileExInfoStandard, &src_info)

-         && src_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY

-@@ -7432,15 +7439,10 @@ os_symlink_impl(PyObject *module, path_t *src, path_t *dst,

-         }

- #endif

- 

--    if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) {

--        PyErr_SetString(PyExc_ValueError,

--            "symlink: src and dst must be the same type");

--        return NULL;

--    }

- 

- #ifdef MS_WINDOWS

- 

--    Py_BEGIN_ALLOW_THREADS

-+    _Py_BEGIN_SUPPRESS_IPH

-     if (dst->wide) {

-         /* if src is a directory, ensure target_is_directory==1 */

-         target_is_directory |= _check_dirW(src->wide, dst->wide);

-@@ -7453,13 +7455,19 @@ os_symlink_impl(PyObject *module, path_t *src, path_t *dst,

-         result = Py_CreateSymbolicLinkA(dst->narrow, src->narrow,

-                                         target_is_directory);

-     }

--    Py_END_ALLOW_THREADS

-+    _Py_END_SUPPRESS_IPH

- 

-     if (!result)

-         return path_error2(src, dst);

- 

- #else

- 

-+    if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) {

-+        PyErr_SetString(PyExc_ValueError,

-+            "symlink: src and dst must be the same type");

-+        return NULL;

-+    }

-+

-     Py_BEGIN_ALLOW_THREADS

- #if HAVE_SYMLINKAT

-     if (dir_fd != DEFAULT_DIR_FD)

@@ -44,108 +44,6 @@ Co-authored-by: Christian Heimes <christian@python.org>.

  6 files changed, 39 insertions(+), 4 deletions(-)

  create mode 100644 Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst

-diff --git a/Lib/difflib.py b/Lib/difflib.py

-index 076bbac01dee..b4ec33505644 100644

-+++ b/Lib/difflib.py

-@@ -1083,7 +1083,7 @@ def _qformat(self, aline, bline, atags, btags):

- 

- import re

- 

--def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match):

-+def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match):

-     r"""

-     Return 1 for ignorable line: iff `line` is blank or contains a single '#'.

- 

-diff --git a/Lib/poplib.py b/Lib/poplib.py

-index 516b6f060d28..2437ea0e2717 100644

-+++ b/Lib/poplib.py

-@@ -308,7 +308,7 @@ def rpop(self, user):

-         return self._shortcmd('RPOP %s' % user)

- 

- 

--    timestamp = re.compile(br'\+OK.*(<[^>]+>)')

-+    timestamp = re.compile(br'\+OK.[^<]*(<.*>)')

- 

-     def apop(self, user, password):

-         """Authorisation

-diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py

-index ab9debf8e252..b6c8a7dd5bed 100644

-+++ b/Lib/test/test_difflib.py

-@@ -466,13 +466,33 @@ def _assert_type_error(self, msg, generator, *args):

-             list(generator(*args))

-         self.assertEqual(msg, str(ctx.exception))

- 

-+class TestJunkAPIs(unittest.TestCase):

-+    def test_is_line_junk_true(self):

-+        for line in ['#', '  ', ' #', '# ', ' # ', '']:

-+            self.assertTrue(difflib.IS_LINE_JUNK(line), repr(line))

-+

-+    def test_is_line_junk_false(self):

-+        for line in ['##', ' ##', '## ', 'abc ', 'abc #', 'Mr. Moose is up!']:

-+            self.assertFalse(difflib.IS_LINE_JUNK(line), repr(line))

-+

-+    def test_is_line_junk_REDOS(self):

-+        evil_input = ('\t' * 1000000) + '##'

-+        self.assertFalse(difflib.IS_LINE_JUNK(evil_input))

-+

-+    def test_is_character_junk_true(self):

-+        for char in [' ', '\t']:

-+            self.assertTrue(difflib.IS_CHARACTER_JUNK(char), repr(char))

-+

-+    def test_is_character_junk_false(self):

-+        for char in ['a', '#', '\n', '\f', '\r', '\v']:

-+            self.assertFalse(difflib.IS_CHARACTER_JUNK(char), repr(char))

- 

- def test_main():

-     difflib.HtmlDiff._default_prefix = 0

-     Doctests = doctest.DocTestSuite(difflib)

-     run_unittest(

-         TestWithAscii, TestAutojunk, TestSFpatches, TestSFbugs,

--        TestOutputFormat, TestBytes, Doctests)

-+        TestOutputFormat, TestBytes, TestJunkAPIs, Doctests)

- 

- if __name__ == '__main__':

-     test_main()

-diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py

-index bceeb93ad14a..799e40365214 100644

-+++ b/Lib/test/test_poplib.py

-@@ -300,9 +300,19 @@ def test_noop(self):

-     def test_rpop(self):

-         self.assertOK(self.client.rpop('foo'))

- 

--    def test_apop(self):

-+    def test_apop_normal(self):

-         self.assertOK(self.client.apop('foo', 'dummypassword'))

- 

-+    def test_apop_REDOS(self):

-+        # Replace welcome with very long evil welcome.

-+        # NB The upper bound on welcome length is currently 2048.

-+        # At this length, evil input makes each apop call take

-+        # on the order of milliseconds instead of microseconds.

-+        evil_welcome = b'+OK' + (b'<' * 1000000)

-+        with test_support.swap_attr(self.client, 'welcome', evil_welcome):

-+            # The evil welcome is invalid, so apop should throw.

-+            self.assertRaises(poplib.error_proto, self.client.apop, 'a', 'kb')

-+

-     def test_top(self):

-         expected =  (b'+OK 116 bytes',

-                      [b'From: postmaster@python.org', b'Content-Type: text/plain',

-diff --git a/Misc/ACKS b/Misc/ACKS

-index 1a35aad66ce7..72c5d740bdd2 100644

-+++ b/Misc/ACKS

-@@ -341,6 +341,7 @@ Kushal Das

- Jonathan Dasteel

- Pierre-Yves David

- A. Jesse Jiryu Davis

-+Jamie (James C.) Davis

- Merlijn van Deen

- John DeGood

- Ned Deily

 diff --git a/Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst b/Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst

 new file mode 100644

 index 000000000000..9ebabb44f91e

@@ -1,14 +1,14 @@

 Summary:        A high-level scripting language

 Name:           python3

-Version:        3.5.5

-Release:        2%{?dist}

+Version:        3.5.6

+Release:        1%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz

-%define         sha1 Python=66c4cfc0f64b545ee5a7725f26a2fd834cdf1682

+%define         sha1 Python=05548da58ec75a7af316c4a4cb8fc667ac6ac8f9

 Patch0:         cgi3.patch

 Patch1:         sockWarning.patch

 Patch3:         python3-CVE-2018-1000117.patch

@@ -199,6 +199,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/idle*

 %changelog

+*   Thu Dec 06 2018 Sujay G <gsujay@vmware.com> 3.5.6-1

+-   Upgrade to version 3.5.6

 *   Fri Aug 17 2018 Dweep Advani <dadvani@vmware.com> 3.5.5-2

 -   Fix CVE-2018-1060 and CVE-2018-1061

 *   Fri May 11 2018 Xiaolin Li <xiaolinl@vmware.com> 3.5.5-1

@@ -210,7 +212,7 @@ rm -rf %{buildroot}/*

 *   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 3.5.3-7

 -   Release bump for expat version update

 *   Thu Sep 14 2017 Kumar Kaushik <kaushikk@vmware.com> 3.5.3-6

--   Adding patch for socket cleanup issue, Bug # 1956257. 

+-   Adding patch for socket cleanup issue, Bug # 1956257.

 *   Fri Jul 28 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.3-5

 -   Fixed dependencies for easy_install-3.5

 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.3-4