From 443dda4cbebd6327ea807b7976ec11b4d8708cd9 Mon Sep 17 00:00:00 2001
From: "pedemont%us.ibm.com"
 <pedemont%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 16 Mar 2006 20:59:42 +0000
Subject: [PATCH] Bug 329159 - StringIndexOutOfBoundsException in
 Mozilla.getGREPathFromRegistryFile. r=mkaply.

git-svn-id: svn://10.0.0.236/trunk@192497 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/java/xpcom/interfaces/Mozilla.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mozilla/extensions/java/xpcom/interfaces/Mozilla.java b/mozilla/extensions/java/xpcom/interfaces/Mozilla.java
index da4810ada0e..650ac1a7248 100644
--- a/mozilla/extensions/java/xpcom/interfaces/Mozilla.java
+++ b/mozilla/extensions/java/xpcom/interfaces/Mozilla.java
@@ -339,9 +339,15 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError {
       // get 'section' name, which will be a registry key name
       String section = (String) sectionsIter.next();
 
+      // Skip over GRE key ("<root>\Software\mozilla.org\GRE")
+      int gre_len = aKeyName.length();
+      if (section.length() <= gre_len) {
+        continue;
+      }
+
       // Get the GRE subkey;  that is, everything after
       // "<root>\Software\mozilla.org\GRE\"
-      String subkeyName = section.substring(aKeyName.length() + 1);
+      String subkeyName = section.substring(gre_len + 1);
 
       // We are only interested in _immediate_ subkeys.  We want
       // "<root>\Software\mozilla.org\GRE\<version>" but not