svn commit: r1553554 - in /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki: diff/ContextualDiffProvider.java search/SearchMatcher.java util/comparators/HumanComparator.java

[ju...@apache.org]

Author: juanpablo
Date: Thu Dec 26 19:17:13 2013
New Revision: 1553554

URL: http://svn.apache.org/r1553554
Log:
sonar: Security - Array is stored directly

Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1553554&r1=1553553&r2=1553554&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java Thu Dec 26 19:17:13 2013
@@ -34,7 +34,11 @@ import org.suigeneris.jrcs.diff.Diff;
 import org.suigeneris.jrcs.diff.DifferentiationFailedException;
 import org.suigeneris.jrcs.diff.Revision;
 import org.suigeneris.jrcs.diff.RevisionVisitor;
-import org.suigeneris.jrcs.diff.delta.*;
+import org.suigeneris.jrcs.diff.delta.AddDelta;
+import org.suigeneris.jrcs.diff.delta.ChangeDelta;
+import org.suigeneris.jrcs.diff.delta.Chunk;
+import org.suigeneris.jrcs.diff.delta.DeleteDelta;
+import org.suigeneris.jrcs.diff.delta.Delta;
 import org.suigeneris.jrcs.diff.myers.MyersDiff;
 
 
@@ -45,8 +49,7 @@ import org.suigeneris.jrcs.diff.myers.My
  * Suggested by John Volkar.
  *
  */
-public class ContextualDiffProvider implements DiffProvider
-{
+public class ContextualDiffProvider implements DiffProvider {
 
     private static final Logger log = Logger.getLogger( ContextualDiffProvider.class );
 
@@ -250,7 +253,7 @@ public class ContextualDiffProvider impl
         private ChangeMerger( final StringBuffer sb, final String[] origStrings, final int max )
         {
             m_sb = sb;
-            m_origStrings = origStrings;
+            m_origStrings = origStrings != null ? origStrings.clone() : null;
             m_max = max;
 
             m_origBuf = new StringBuffer();

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java?rev=1553554&r1=1553553&r2=1553554&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java Thu Dec 26 19:17:13 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.wiki.search;
 
-
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.StringReader;
@@ -26,6 +25,7 @@ import java.io.StringReader;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 
+
 /**
  * SearchMatcher performs the task of matching a search query to a page's
  * contents. This utility class is isolated to simplify WikiPageProvider
@@ -47,7 +47,7 @@ public class SearchMatcher {
      */
     public SearchMatcher( WikiEngine engine, QueryItem[] queries ) {
         m_engine = engine;
-        m_queries = queries;
+        m_queries = queries != null ? queries.clone() : null;
     }
 
     /**

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java?rev=1553554&r1=1553553&r2=1553554&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java Thu Dec 26 19:17:13 2013
@@ -289,6 +289,6 @@ public class HumanComparator implements 
         {
             throw new IllegalArgumentException( "The sort order must contain EXACTLY one of each CharType" );
         }
-        this.sortOrder = sortOrder;
+        this.sortOrder = sortOrder != null ? sortOrder.clone() : null;
     }
 }