Merge pull request #436 from wcko87/filepath_resolve_invalidpathexception

Fix beatoraja crash when path.resolve() is called with file name = ???

Author: exch-bms2

src/bms/player/beatoraja/audio/AbstractAudioDriver.java

@@ -3,6 +3,7 @@
 import bms.model.*;
 import bms.player.beatoraja.ResourcePool;
 
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
@@ -249,37 +250,40 @@ public synchronized void setModel(BMSModel model) {
 				return;
 			}
 			String name = model.getWavList()[wavid];
-			for (Note note : waventry.getValue()) {
-				// 音切りあり・なし両方のデータが必要になるケースがある
-				if (note.getMicroStarttime() == 0 && note.getMicroDuration() == 0) {
-					// 音切りなしのケース
-					Path p = dpath.resolve(name);
-					wavmap[wavid] = cache.get(new AudioKey(p.toString(), note));
-					if (wavmap[wavid] == null) {
-						break;
-					}
-				} else {
-					// 音切りありのケース
-					boolean b = true;
-					if (slicesound[note.getWav()] == null) {
-						slicesound[note.getWav()] = new Array<SliceWav<T>>();
-					}
-					for (SliceWav<T> slice : slicesound[note.getWav()]) {
-						if (slice.starttime == note.getMicroStarttime() && slice.duration == note.getMicroDuration()) {
-							b = false;
+			try {
+				Path p = dpath.resolve(name);
+				for (Note note : waventry.getValue()) {
+					// 音切りあり・なし両方のデータが必要になるケースがある
+					if (note.getMicroStarttime() == 0 && note.getMicroDuration() == 0) {
+						// 音切りなしのケース
+						wavmap[wavid] = cache.get(new AudioKey(p.toString(), note));
+						if (wavmap[wavid] == null) {
 							break;
 						}
-					}
-					if (b) {
-						Path p = dpath.resolve(name);
-						T sliceaudio = cache.get(new AudioKey(p.toString(), note));
-						if (sliceaudio != null) {
-							slicesound[note.getWav()].add(new SliceWav<T>(note, sliceaudio));
-						} else {
-							return;
+					} else {
+						// 音切りありのケース
+						boolean b = true;
+						if (slicesound[note.getWav()] == null) {
+							slicesound[note.getWav()] = new Array<SliceWav<T>>();
+						}
+						for (SliceWav<T> slice : slicesound[note.getWav()]) {
+							if (slice.starttime == note.getMicroStarttime() && slice.duration == note.getMicroDuration()) {
+								b = false;
+								break;
+							}
+						}
+						if (b) {
+							T sliceaudio = cache.get(new AudioKey(p.toString(), note));
+							if (sliceaudio != null) {
+								slicesound[note.getWav()].add(new SliceWav<T>(note, sliceaudio));
+							} else {
+								return;
+							}
 						}
 					}
 				}
+			} catch (InvalidPathException e) {
+				Logger.getGlobal().warning(e.getMessage());
 			}
 			progress.incrementAndGet();
 		});

src/bms/player/beatoraja/play/bga/BGAProcessor.java

@@ -121,44 +121,48 @@ public synchronized void setModel(BMSModel model) {
 					break;
 				}
 				Path f = null;
-				if (Files.exists(dpath.resolve(name))) {
-					final int index = name.lastIndexOf('.');
-					String fex = null;
-					if (index != -1) {
-						fex = name.substring(index + 1).toLowerCase();
+				try {
+					if (Files.exists(dpath.resolve(name))) {
+						final int index = name.lastIndexOf('.');
+						String fex = null;
+						if (index != -1) {
+							fex = name.substring(index + 1).toLowerCase();
+						}
+						if(fex != null && !(Arrays.asList(mov_extension).contains(fex))){
+							f = dpath.resolve(name);
+						}else if(fex != null){
+							name = name.substring(0, index);
+							for (String mov : mov_extension) {
+								final Path mpgfile = dpath.resolve(name + "." + mov);
+								if (Files.exists(mpgfile)) {
+									f = mpgfile;
+									break;
+								}
+							}
+						}
 					}
-					if(fex != null && !(Arrays.asList(mov_extension).contains(fex))){
-						f = dpath.resolve(name);
-					}else if(fex != null){
-						name = name.substring(0, index);
+					if (f == null) {
+						final int index = name.lastIndexOf('.');
+						if (index != -1) {
+							name = name.substring(0, index);
+						}
 						for (String mov : mov_extension) {
 							final Path mpgfile = dpath.resolve(name + "." + mov);
 							if (Files.exists(mpgfile)) {
 								f = mpgfile;
 								break;
 							}
 						}
-					}
-				}
-				if (f == null) {
-					final int index = name.lastIndexOf('.');
-					if (index != -1) {
-						name = name.substring(0, index);
-					}
-					for (String mov : mov_extension) {
-						final Path mpgfile = dpath.resolve(name + "." + mov);
-						if (Files.exists(mpgfile)) {
-							f = mpgfile;
-							break;
-						}
-					}
-					for (String mov : BGImageProcessor.pic_extension) {
-						final Path picfile = dpath.resolve(name + "." + mov);
-						if (Files.exists(picfile)) {
-							f = picfile;
-							break;
+						for (String mov : BGImageProcessor.pic_extension) {
+							final Path picfile = dpath.resolve(name + "." + mov);
+							if (Files.exists(picfile)) {
+								f = picfile;
+								break;
+							}
 						}
 					}
+				} catch (InvalidPathException e) {
+					Logger.getGlobal().warning(e.getMessage());
 				}
 
 				if (f != null) {

src/bms/player/beatoraja/select/PreviewMusicProcessor.java

@@ -1,8 +1,10 @@
 package bms.player.beatoraja.select;
 
+import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
 import java.util.Deque;
 import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.logging.Logger;
 
 import bms.player.beatoraja.Config;
 import bms.player.beatoraja.audio.AudioDriver;
@@ -44,8 +46,16 @@ public void start(SongData song) {
             preview.start();
         }
         current = song;
-        commands.add(song != null && song.getPreview() != null && song.getPreview().length() > 0 ?
-                Paths.get(song.getPath()).getParent().resolve(song.getPreview()).toString() : "");
+
+        String previewPath = "";
+        if (song != null && song.getPreview() != null && song.getPreview().length() > 0) {
+            try {
+                previewPath = Paths.get(song.getPath()).getParent().resolve(song.getPreview()).toString();
+            } catch (InvalidPathException e) {
+                Logger.getGlobal().warning(e.getMessage());
+            }
+        }
+        commands.add(previewPath);
     }
 
     public SongData getSongData() {