From 4d8bc1cb6e0f9b5896c35f520f11fc9ab0c7fc5d Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Wed, 27 Feb 2013 17:05:18 -0800
Subject: [PATCH] --- yaml --- r: 359394 b: refs/heads/master c:
 06004e6eebdaf101a0f9b533fac77b5768d2c09c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/block/partitions/mac.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4c408fa40941..5fd7c96e490f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8a6e1881be8d73b7a98f84ccec61e624ec5cac
+refs/heads/master: 06004e6eebdaf101a0f9b533fac77b5768d2c09c
diff --git a/trunk/block/partitions/mac.c b/trunk/block/partitions/mac.c
index 11f688bd76c5..76d8ba6379a9 100644
--- a/trunk/block/partitions/mac.c
+++ b/trunk/block/partitions/mac.c
@@ -63,6 +63,10 @@ int mac_partition(struct parsed_partitions *state)
 		put_dev_sector(sect);
 		return 0;
 	}
+
+	if (blocks_in_map >= state->limit)
+		blocks_in_map = state->limit - 1;
+
 	strlcat(state->pp_buf, " [mac]", PAGE_SIZE);
 	for (slot = 1; slot <= blocks_in_map; ++slot) {
 		int pos = slot * secsize;