From d4002ef6ce187037c47ead0e73bbadcc9082f192 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 11 Jan 2020 11:27:35 +0100 Subject: [PATCH] Fix two possible nullptr deref --- .../org/airsonic/player/controller/CoverArtController.java | 4 +++- .../airsonic/player/controller/SubsonicRESTController.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java index cdb27e2c..6036d71e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java @@ -95,7 +95,9 @@ public class CoverArtController implements LastModified { public long getLastModified(HttpServletRequest request) { CoverArtRequest coverArtRequest = createCoverArtRequest(request); - // LOG.info("getLastModified - " + coverArtRequest + ": " + new Date(result)); + if (null == coverArtRequest) { + return -1L; + } return coverArtRequest.lastModified(); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java index 427c3904..2a808bef 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java @@ -2115,7 +2115,10 @@ public class SubsonicRESTController { command.setShareRole(getBooleanParameter(request, "shareRole", u.isShareRole())); int maxBitRate = getIntParameter(request, "maxBitRate", s.getTranscodeScheme().getMaxBitRate()); - command.setTranscodeSchemeName(TranscodeScheme.fromMaxBitRate(maxBitRate).name()); + TranscodeScheme transcodeScheme = TranscodeScheme.fromMaxBitRate(maxBitRate); + if (transcodeScheme != null) { + command.setTranscodeSchemeName(transcodeScheme.name()); + } if (hasParameter(request, "password")) { command.setPassword(decrypt(getRequiredStringParameter(request, "password")));