Merge pull request #12 from IngvarJackal/master

Igor Steinmacher · Igor Steinmacher · commit 582fbec7947b · 2014-07-16T15:57:22.000-03:00
BugFix for #959 "StringIndexOutOfBoundsException with invalid Preview text"
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,7 @@
     - Support FindFullText with ACS DOIs (pull request #9)
     - Fixes groups and adds optional 2.9.2 save ordering (pull request #10)
     - Fixes bug 880 "PubMed Import broken" (pull request #11 by vegeziel)
+    - Fixes bug #959 "StringIndexOutOfBoundsException with invalid Preview text" (pull request #12 by IngvarJackal)
 2.10
     - Made IEEEXploreFetcher author parsing work again.
     - Added a few more characters in the HTML/Unicode to LaTeX conversion.
diff --git a/src/main/java/net/sf/jabref/PreviewPanel.java b/src/main/java/net/sf/jabref/PreviewPanel.java
@@ -364,6 +364,8 @@ public void setEntry(BibtexEntry newEntry) {
 		try {
 			readLayout();
 			update();
+		} catch (StringIndexOutOfBoundsException ex) {
+			throw ex;
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}
diff --git a/src/main/java/net/sf/jabref/PreviewPrefsTab.java b/src/main/java/net/sf/jabref/PreviewPrefsTab.java
@@ -163,20 +163,30 @@ public void actionPerformed(ActionEvent e) {
 		test1.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				getTestEntry();
-				PreviewPanel testPanel = new PreviewPanel(null, entry, null , new MetaData(), layout1.getText());
-				testPanel.setPreferredSize(new Dimension(800, 350));
-				JOptionPane.showMessageDialog(null, testPanel, Globals.lang("Preview"),
-					JOptionPane.PLAIN_MESSAGE);
+				try {
+					PreviewPanel testPanel = new PreviewPanel(null, entry, null , new MetaData(), layout1.getText());
+					testPanel.setPreferredSize(new Dimension(800, 350));
+					JOptionPane.showMessageDialog(null, testPanel, Globals.lang("Preview"),
+						JOptionPane.PLAIN_MESSAGE);
+				} catch (StringIndexOutOfBoundsException ex) {
+					ex.printStackTrace();
+					JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
+				}
 			}
 		});
 
 		test2.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				getTestEntry();
-				PreviewPanel testPanel = new PreviewPanel(null, entry, null, new MetaData(), layout2.getText());
-				testPanel.setPreferredSize(new Dimension(800, 350));
-				JOptionPane.showMessageDialog(null, new JScrollPane(testPanel),
-                                        Globals.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
+				try {
+					PreviewPanel testPanel = new PreviewPanel(null, entry, null, new MetaData(), layout2.getText());
+					testPanel.setPreferredSize(new Dimension(800, 350));
+					JOptionPane.showMessageDialog(null, new JScrollPane(testPanel),
+	                                        Globals.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
+				} catch (StringIndexOutOfBoundsException ex) {
+					ex.printStackTrace();
+					JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
+				}
 			}
 		});
 	}
diff --git a/src/main/java/net/sf/jabref/export/layout/LayoutHelper.java b/src/main/java/net/sf/jabref/export/layout/LayoutHelper.java
@@ -20,6 +20,8 @@
 import java.io.Reader;
 import java.util.Vector;
 
+import javax.swing.JOptionPane;
+
 
 /**
  * Helper class to get a Layout object.
@@ -62,8 +64,8 @@ public LayoutHelper(Reader in)
     }
 
     public Layout getLayoutFromText(String classPrefix) throws Exception
-    {
-        parse();
+    {    	
+    	parse();
 
         StringInt si;
 
@@ -76,7 +78,7 @@ public Layout getLayoutFromText(String classPrefix) throws Exception
                 si.s = si.s.trim().toLowerCase();
             }
         }
-
+        
         Layout layout = new Layout(parsedEntries, classPrefix);
 
         return layout;
@@ -288,7 +290,7 @@ else if (c == '"') {
         return null;
     }
 
-    private Object parse() throws IOException {
+    private Object parse() throws IOException, StringIndexOutOfBoundsException {
 		skipWhitespace();
 
 		int c;
@@ -344,10 +346,11 @@ private Object parse() throws IOException {
     /**
 	 * 
 	 */
-    private void parseField() throws IOException
+    private void parseField() throws IOException, StringIndexOutOfBoundsException
     {
         int c;
         StringBuffer buffer = null;
+        char firstLetter = ' ';
         String name;
 
         while (!_eof)
@@ -365,11 +368,21 @@ private void parseField() throws IOException
 
                 //System.out.println("\n#" + (char) c);
                 name = buffer != null ? buffer.toString() : "";
-
+                
+                try {
+                	firstLetter = name.charAt(0);
+                } catch (StringIndexOutOfBoundsException ex) {
+                	StringBuilder lastFive = new StringBuilder(10); 
+                	for (StringInt entry : parsedEntries.subList(Math.max(0, parsedEntries.size()-6), parsedEntries.size()-1)) {
+                		lastFive.append(entry.s);
+                	}
+                	throw new StringIndexOutOfBoundsException("Backslash parsing error near " + "\'" + lastFive.toString().replace("\n", " ") +  "\'");
+                }
+                
                 //System.out.println("NAME:" + name);
                 buffer = null;
-
-                if (name.charAt(0) == 'b')
+                
+                if (firstLetter == 'b')
                 {
                     if (name.equalsIgnoreCase("begin"))
                     {
@@ -385,7 +398,7 @@ else if (name.equalsIgnoreCase("begingroup"))
                         return;                    
                     }
                 }
-                else if (name.charAt(0) == 'f')
+                else if (firstLetter == 'f')
                 {
                     if (name.equalsIgnoreCase("format"))
                     {
@@ -422,7 +435,7 @@ else if (name.equalsIgnoreCase("filepath"))
                         return;
                     }
                 }
-                else if (name.charAt(0) == 'e')
+                else if (firstLetter == 'e')
                 {
                     if (name.equalsIgnoreCase("end"))
                     {

Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,8 @@ public void setEntry(BibtexEntry newEntry) {`
`364`	`364`	`try {`
`365`	`365`	`readLayout();`
`366`	`366`	`update();`
	`367`	`+ } catch (StringIndexOutOfBoundsException ex) {`
	`368`	`+ throw ex;`
`367`	`369`	`} catch (Exception ex) {`
`368`	`370`	`ex.printStackTrace();`
`369`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`import java.io.Reader;`
`21`	`21`	`import java.util.Vector;`
`22`	`22`
	`23`	`+import javax.swing.JOptionPane;`
	`24`	`+`
`23`	`25`
`24`	`26`	`/**`
`25`	`27`	`* Helper class to get a Layout object.`
`@@ -62,8 +64,8 @@ public LayoutHelper(Reader in)`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`public Layout getLayoutFromText(String classPrefix) throws Exception`
`65`		`- {`
`66`		`- parse();`
	`67`	`+ {`
	`68`	`+ parse();`
`67`	`69`
`68`	`70`	`StringInt si;`
`69`	`71`
`@@ -76,7 +78,7 @@ public Layout getLayoutFromText(String classPrefix) throws Exception`
`76`	`78`	`si.s = si.s.trim().toLowerCase();`
`77`	`79`	`}`
`78`	`80`	`}`
`79`		`-`
	`81`	`+`
`80`	`82`	`Layout layout = new Layout(parsedEntries, classPrefix);`
`81`	`83`
`82`	`84`	`return layout;`
`@@ -288,7 +290,7 @@ else if (c == '"') {`
`288`	`290`	`return null;`
`289`	`291`	`}`
`290`	`292`
`291`		`- private Object parse() throws IOException {`
	`293`	`+ private Object parse() throws IOException, StringIndexOutOfBoundsException {`
`292`	`294`	`skipWhitespace();`
`293`	`295`
`294`	`296`	`int c;`
`@@ -344,10 +346,11 @@ private Object parse() throws IOException {`
`344`	`346`	`/**`
`345`	`347`	`*`
`346`	`348`	`*/`
`347`		`- private void parseField() throws IOException`
	`349`	`+ private void parseField() throws IOException, StringIndexOutOfBoundsException`
`348`	`350`	`{`
`349`	`351`	`int c;`
`350`	`352`	`StringBuffer buffer = null;`
	`353`	`+ char firstLetter = ' ';`
`351`	`354`	`String name;`
`352`	`355`
`353`	`356`	`while (!_eof)`
`@@ -365,11 +368,21 @@ private void parseField() throws IOException`
`365`	`368`
`366`	`369`	`//System.out.println("\n#" + (char) c);`
`367`	`370`	`name = buffer != null ? buffer.toString() : "";`
`368`		`-`
	`371`	`+`
	`372`	`+ try {`
	`373`	`+ firstLetter = name.charAt(0);`
	`374`	`+ } catch (StringIndexOutOfBoundsException ex) {`
	`375`	`+ StringBuilder lastFive = new StringBuilder(10);`
	`376`	`+ for (StringInt entry : parsedEntries.subList(Math.max(0, parsedEntries.size()-6), parsedEntries.size()-1)) {`
	`377`	`+ lastFive.append(entry.s);`
	`378`	`+ }`
	`379`	`+ throw new StringIndexOutOfBoundsException("Backslash parsing error near " + "\'" + lastFive.toString().replace("\n", " ") + "\'");`
	`380`	`+ }`
	`381`	`+`
`369`	`382`	`//System.out.println("NAME:" + name);`
`370`	`383`	`buffer = null;`
`371`		`-`
`372`		`- if (name.charAt(0) == 'b')`
	`384`	`+`
	`385`	`+ if (firstLetter == 'b')`
`373`	`386`	`{`
`374`	`387`	`if (name.equalsIgnoreCase("begin"))`
`375`	`388`	`{`
`@@ -385,7 +398,7 @@ else if (name.equalsIgnoreCase("begingroup"))`
`385`	`398`	`return;`
`386`	`399`	`}`
`387`	`400`	`}`
`388`		`- else if (name.charAt(0) == 'f')`
	`401`	`+ else if (firstLetter == 'f')`
`389`	`402`	`{`
`390`	`403`	`if (name.equalsIgnoreCase("format"))`
`391`	`404`	`{`
`@@ -422,7 +435,7 @@ else if (name.equalsIgnoreCase("filepath"))`
`422`	`435`	`return;`
`423`	`436`	`}`
`424`	`437`	`}`
`425`		`- else if (name.charAt(0) == 'e')`
	`438`	`+ else if (firstLetter == 'e')`
`426`	`439`	`{`
`427`	`440`	`if (name.equalsIgnoreCase("end"))`
`428`	`441`	`{`