Merge branch 'master' into rw-ie11-crypto

uuidjs · Apr 25, 2018 · 748dbbf · 748dbbf
2 parents b19b58f + df40e54
commit 748dbbf
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/v35.js b/lib/v35.js
@@ -43,7 +43,10 @@ module.exports = function(name, version, hashfunc) {
     return buf || bytesToUuid(bytes);
   };
 
-  generateUUID.name = name;
+  // only attempt to set the name if's configurable (which it should be on node > 0.12)
+  if (Object.getOwnPropertyDescriptor(generateUUID, 'name').configurable) {
+    Object.defineProperty(generateUUID, 'name', {value: name});
+  }
 
   // Pre-defined namespaces, per Appendix C
   generateUUID.DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';