commit 5734f41a9b46b4fd65b6ba90240b108f8a0b7c57
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Thu May 24 16:22:59 2018 -0700
committer GitHub <noreply@github.com> Thu May 24 16:22:59 2018 -0700
tree 6f3f2aec5631ee53c66d469ac3b3a5ed81c13b45
parent d9eb22c67c38b45764dd924801c72092770d200f

bpo-32493: Fix uuid.uuid1() on FreeBSD. (GH-7099)


Use uuid_enc_be() if available to encode UUID to bytes as big endian.
(cherry picked from commit 17d8830312d82e7de42ab89739b0771f712645ff)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Modules/_uuidmodule.c

diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index 16aa09b..8949914 100644
--- a/Modules/_uuidmodule.c
+++ b/Modules/_uuidmodule.c
@@ -18,10 +18,16 @@
 
     res = uuid_generate_time_safe(uuid);
     return Py_BuildValue("y#i", (const char *) uuid, sizeof(uuid), res);
-#elif HAVE_UUID_CREATE
+#elif defined(HAVE_UUID_CREATE)
     uint32_t status;
     uuid_create(&uuid, &status);
+# if defined(HAVE_UUID_ENC_BE)
+    unsigned char buf[sizeof(uuid)];
+    uuid_enc_be(buf, &uuid);
+    return Py_BuildValue("y#i", buf, sizeof(uuid), (int) status);
+# else
     return Py_BuildValue("y#i", (const char *) &uuid, sizeof(uuid), (int) status);
+# endif
 #else
     uuid_generate_time(uuid);
     return Py_BuildValue("y#O", (const char *) uuid, sizeof(uuid), Py_None);
@@ -57,6 +63,7 @@
     }
     if (PyModule_AddIntConstant(mod, "has_uuid_generate_time_safe",
                                 has_uuid_generate_time_safe) < 0) {
+        Py_DECREF(mod);
         return NULL;
     }