From da71a29de2e37d222c2559090deb66725fcb0a7a Mon Sep 17 00:00:00 2001
From: Tyler Church <Tyler.Church@Iicorporate.com>
Date: Wed, 23 Mar 2016 16:14:45 -0700
Subject: [PATCH 1/2] diff.blobToBuffer: Fix passing in Buffers instead of
 strings.

---
 lib/diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diff.js b/lib/diff.js
index 34c279047..07c73a9a1 100644
--- a/lib/diff.js
+++ b/lib/diff.js
@@ -84,7 +84,7 @@ Diff.blobToBuffer= function(
     this,
     old_blob,
     old_as_path,
-    buffer,
+    bufferText,
     bufferLength,
     buffer_as_path,
     opts,

From a87b573f00b97842737abc41d8360bbc76a86f53 Mon Sep 17 00:00:00 2001
From: Tyler Church <Tyler.Church@Iicorporate.com>
Date: Wed, 23 Mar 2016 20:51:03 -0700
Subject: [PATCH 2/2] Diff.blobToBuffer: consistently use Buffer.byteLength

---
 lib/diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diff.js b/lib/diff.js
index 07c73a9a1..b397ecd2b 100644
--- a/lib/diff.js
+++ b/lib/diff.js
@@ -72,7 +72,7 @@ Diff.blobToBuffer= function(
   var bufferLength;
   if (buffer instanceof Buffer) {
     bufferText = buffer.toString("utf8");
-    bufferLength = buffer.length;
+    bufferLength = Buffer.byteLength(buffer, "utf8");
   } else {
     bufferText = buffer;
     bufferLength = !buffer ? 0 : Buffer.byteLength(buffer, "utf8");