[icedtea-web] RFC: Handle a requested heap size of '1g'

[Omair Majid]

Hi,

I just ran across this jnlp file: http://atlaslivecasino.net/casino_game.jnlp

This fails to work with HEAD because the application asks for a heap
size of '1G'. This is not a regression.

The attached patch fixes it.

Thanks,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
-------------- next part --------------
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-28  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JREDesc.java (checkHeapSize): Accept 'g' and
+	'G' suffixes. Handle single-digit heap size.
+	* tests/netx/unit/net/sourceforge/jnlp/JREDescTest.java: New file.
+
 2014-03-28  Omair Majid  <omajid at redhat.com>
 
 	* acinclude.m4
diff --git a/netx/net/sourceforge/jnlp/JREDesc.java b/netx/net/sourceforge/jnlp/JREDesc.java
--- a/netx/net/sourceforge/jnlp/JREDesc.java
+++ b/netx/net/sourceforge/jnlp/JREDesc.java
@@ -135,11 +135,11 @@
         }
 
         boolean lastCharacterIsDigit = true;
-        // the last character must be 0-9 or k/K/m/M
+        // the last character must be 0-9 or k/K/m/M/g/G
         char lastChar = Character.toLowerCase(heapSize.charAt(heapSize.length() - 1));
         if ((lastChar < '0' || lastChar > '9')) {
             lastCharacterIsDigit = false;
-            if (lastChar != 'k' && lastChar != 'm') {
+            if (lastChar != 'k' && lastChar != 'm' && lastChar != 'g') {
                 throw new ParseException(R("PBadHeapSize", heapSize));
             }
         }
@@ -149,7 +149,7 @@
             indexOfLastDigit = indexOfLastDigit - 1;
         }
 
-        String size = heapSize.substring(0, indexOfLastDigit);
+        String size = heapSize.substring(0, indexOfLastDigit+1);
         try {
             // check that the number is a number!
             Integer.valueOf(size);
diff --git a/tests/netx/unit/net/sourceforge/jnlp/JREDescTest.java b/tests/netx/unit/net/sourceforge/jnlp/JREDescTest.java
new file mode 100644
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/JREDescTest.java
@@ -0,0 +1,76 @@
+/* JREDescTest.java
+   Copyright (C) 2014 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp;
+
+import org.junit.Test;
+
+public class JREDescTest {
+
+    @Test
+    public void testInitialHeapSize() throws ParseException {
+        new JREDesc(null, null, null, "1", null, null);
+        new JREDesc(null, null, null, "99999999", null, null);
+        new JREDesc(null, null, null, "1k", null, null);
+        new JREDesc(null, null, null, "1000k", null, null);
+        new JREDesc(null, null, null, "1K", null, null);
+        new JREDesc(null, null, null, "1000K", null, null);
+        new JREDesc(null, null, null, "1m", null, null);
+        new JREDesc(null, null, null, "1m", null, null);
+        new JREDesc(null, null, null, "1M", null, null);
+        new JREDesc(null, null, null, "1g", null, null);
+        new JREDesc(null, null, null, "1G", null, null);
+        new JREDesc(null, null, null, "10000G", null, null);
+    }
+
+
+    @Test
+    public void testMaximumHeapSize() throws ParseException {
+        new JREDesc(null, null, null, null, "1", null);
+        new JREDesc(null, null, null, null, "99999999", null);
+        new JREDesc(null, null, null, null, "1k", null);
+        new JREDesc(null, null, null, null, "1000k", null);
+        new JREDesc(null, null, null, null, "1K", null);
+        new JREDesc(null, null, null, null, "1000K", null);
+        new JREDesc(null, null, null, null, "1m", null);
+        new JREDesc(null, null, null, null, "1m", null);
+        new JREDesc(null, null, null, null, "1M", null);
+        new JREDesc(null, null, null, null, "1g", null);
+        new JREDesc(null, null, null, null, "1G", null);
+        new JREDesc(null, null, null, null, "10000G", null);
+    }
+}