diff --git a/.pick_status.json b/.pick_status.json
index e373ce2fe45..4bc0ebefb18 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -517,7 +517,7 @@
         "description": "r300: Keep rc_rename_regs() from overflowing RC_REGISTER_MAX_INDEX",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/r300/compiler/radeon_rename_regs.c b/src/gallium/drivers/r300/compiler/radeon_rename_regs.c
index 498b88fca67..4a124e7d4d1 100644
--- a/src/gallium/drivers/r300/compiler/radeon_rename_regs.c
+++ b/src/gallium/drivers/r300/compiler/radeon_rename_regs.c
@@ -29,6 +29,8 @@
  * \file
  */
 
+#include "util/u_math.h"
+
 #include "radeon_rename_regs.h"
 
 #include "radeon_compiler.h"
@@ -60,7 +62,7 @@ void rc_rename_regs(struct radeon_compiler *c, void *user)
 			return;
 	}
 
-	used_length = 2 * rc_recompute_ips(c);
+	used_length = MIN2(2 * rc_recompute_ips(c), RC_REGISTER_MAX_INDEX);
 	used = memory_pool_malloc(&c->Pool, sizeof(unsigned char) * used_length);
 	memset(used, 0, sizeof(unsigned char) * used_length);