Merge v0.13.1 from development into master

awnumar · Oct 23, 2017 · 6844db0 · 6844db0
2 parents 72702e6 + bbea25a
commit 6844db0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -48,3 +48,5 @@ The releases are cryptographically signed with my PGP key, which can be found on
 ```
 $ curl https://keybase.io/awn/pgp_keys.asc | gpg --import
 ```
+
+We **strongly** encourage you to vendor your dependencies for a clean and reliable build. [Glide](http://glide.sh/) makes this task relatively frictionless.
diff --git a/memguard.go b/memguard.go
@@ -184,7 +184,7 @@ func (b *container) MakeImmutable() error {
 
 	if b.mutable {
 		// Mark the memory as mutable.
-		memcall.Protect(getAllMemory(b)[pageSize:pageSize+roundToPageSize(b.Size()+32)], true, false)
+		memcall.Protect(getAllMemory(b)[pageSize:pageSize+roundToPageSize(len(b.buffer)+32)], true, false)
 
 		// Tell everyone about the change we made.
 		b.mutable = false
@@ -211,7 +211,7 @@ func (b *container) MakeMutable() error {
 
 	if !b.mutable {
 		// Mark the memory as mutable.
-		memcall.Protect(getAllMemory(b)[pageSize:pageSize+roundToPageSize(b.Size()+32)], true, true)
+		memcall.Protect(getAllMemory(b)[pageSize:pageSize+roundToPageSize(len(b.buffer)+32)], true, true)
 
 		// Tell everyone about the change we made.
 		b.mutable = true