Merge branch 'master' into gh-13032

Automattic · Feb 15, 2023 · 5f315c4 · 5f315c4
2 parents 0bc7e5e + 06585a8
commit 5f315c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/middleware.md b/docs/middleware.md
@@ -26,7 +26,7 @@ of middleware: document middleware, model middleware, aggregate middleware, and
 
 Document middleware is supported for the following document functions.
 In Mongoose, a document is an instance of a `Model` class.
-In document middleware functions, `this` refers to the document.
+In document middleware functions, `this` refers to the document. To access the model, use `this.constructor`.
 
 * [validate](api/document.html#document_Document-validate)
 * [save](api/model.html#model_Model-save)

diff --git a/lib/schema/uuid.js b/lib/schema/uuid.js
@@ -23,7 +23,7 @@ const Binary = MongooseBuffer.Binary;
 
 function hex2buffer(hex) {
   // use buffer built-in function to convert from hex-string to buffer
-  const buff = Buffer.from(hex, 'hex');
+  const buff = hex != null && Buffer.from(hex, 'hex');
   return buff;
 }
 
@@ -36,7 +36,7 @@ function hex2buffer(hex) {
 
 function binary2hex(buf) {
   // use buffer built-in function to convert from buffer to hex-string
-  const hex = buf.toString('hex');
+  const hex = buf != null && buf.toString('hex');
   return hex;
 }