Changeset 10105 in josm

Timestamp:

2016-04-03T16:12:22+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1353745 + add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -509 +509 @@
             if (!s.isEmpty()) {
                 UnicodeBlock block = Character.UnicodeBlock.of(s.charAt(0));
-                if (block.toString().contains("CJK")) {
+                if (block != null && block.toString().contains("CJK")) {
                     result = s.length() < 4;
                 } else {

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

@@ -104 +104 @@
         assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("geometric corrections"));
         assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("几何校正"));
+        // test with unassigned unicode characters ==> no unicode block
+        assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("\u0860"));
     }
 }