From be2382efb7d76230169f1b35334ac2311b4e958a Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Wed, 4 May 2011 20:07:19 +0000
Subject: [PATCH] SOLR-2495: json parser could hang on corrupted input and fail
 to detect long overflow

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1099582 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/eclipse/dot.classpath              | 2 +-
 dev-tools/maven/pom.xml.template             | 2 +-
 solr/CHANGES.txt                             | 4 ++++
 solr/build.xml                               | 2 +-
 solr/lib/apache-solr-noggit-pom.xml.template | 2 +-
 solr/lib/apache-solr-noggit-r1099557.jar     | 2 ++
 solr/lib/apache-solr-noggit-r944541.jar      | 2 --
 7 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 solr/lib/apache-solr-noggit-r1099557.jar
 delete mode 100755 solr/lib/apache-solr-noggit-r944541.jar

diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index a5d64f92dcc..0f201536149 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -95,7 +95,7 @@
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
-	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
+	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 95987f4c141..546040851f8 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -699,7 +699,7 @@
                   <artifactId>solr-noggit</artifactId>
                   <version>${project.version}</version>
                   <packaging>jar</packaging>
-                  <file>solr/lib/apache-solr-noggit-r944541.jar</file>
+                  <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
                 </configuration>  
               </execution>
               <execution>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 831472aa7de..877183cba80 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -315,6 +315,10 @@ Bug Fixes
 * SOLR-2493: SolrQueryParser was fixed to not parse the SolrConfig DOM tree on each
   instantiation which is a huge slowdown.  (Stephane Bailliez via uschindler)
 
+* SOLR-2495: The JSON parser could hang on corrupted input and could fail
+  to detect numbers that were too large to fit in a long.  (yonik)
+
+
 Other Changes
 ----------------------
 
diff --git a/solr/build.xml b/solr/build.xml
index 8c68ca3464e..80e66fd984a 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -1020,7 +1020,7 @@
                                    jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
 
       <m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
-                                   jar.file="lib/apache-solr-noggit-r944541.jar" />
+                                   jar.file="lib/apache-solr-noggit-r1099557.jar" />
       
       <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template"
                                    jar.file="contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar" />
diff --git a/solr/lib/apache-solr-noggit-pom.xml.template b/solr/lib/apache-solr-noggit-pom.xml.template
index 1596274c115..85b85a4e7d1 100644
--- a/solr/lib/apache-solr-noggit-pom.xml.template
+++ b/solr/lib/apache-solr-noggit-pom.xml.template
@@ -31,6 +31,6 @@
   <artifactId>solr-noggit</artifactId>
   <name>Solr Specific Noggit</name>
   <version>@version@</version>
-  <description>Solr Specific Noggit r944541</description>
+  <description>Solr Specific Noggit r1099557</description>
   <packaging>jar</packaging>
 </project>
diff --git a/solr/lib/apache-solr-noggit-r1099557.jar b/solr/lib/apache-solr-noggit-r1099557.jar
new file mode 100644
index 00000000000..9fb87b9f301
--- /dev/null
+++ b/solr/lib/apache-solr-noggit-r1099557.jar
@@ -0,0 +1,2 @@
+AnyObjectId[5c4007c7e74af85d823243153d308f80e084eff0] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/apache-solr-noggit-r944541.jar b/solr/lib/apache-solr-noggit-r944541.jar
deleted file mode 100755
index e0624dd525f..00000000000
--- a/solr/lib/apache-solr-noggit-r944541.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[9b434f5760dd0d78350bdf8237273c0d5db0174e] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file