sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some potential Uri nullness violations.

Browse source 
PiperOrigin-RevId: 223476569
This commit is contained in:
tonihei 2018-11-30 08:40:17 +00:00 committed by Oliver Woodman
parent 282cf303a4
commit ea483f8c8e
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
View file

@ -228,7 +228,8 @@ public final class DefaultDataSource implements DataSource {
// Choose the correct source for the scheme. // Choose the correct source for the scheme.
String scheme = dataSpec.uri.getScheme(); String scheme = dataSpec.uri.getScheme();
if (Util.isLocalFileUri(dataSpec.uri)) { if (Util.isLocalFileUri(dataSpec.uri)) {
if (dataSpec.uri.getPath().startsWith("/android_asset/")) { String uriPath = dataSpec.uri.getPath();
if (uriPath != null && uriPath.startsWith("/android_asset/")) {
dataSource = getAssetDataSource(); dataSource = getAssetDataSource();
} else { } else {
dataSource = getFileDataSource(); dataSource = getFileDataSource();

3
library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
View file

@ -204,7 +204,8 @@ public final class Util {
} }
for (Uri uri : uris) { for (Uri uri : uris) {
if ("http".equals(uri.getScheme()) if ("http".equals(uri.getScheme())
&& !NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(uri.getHost())) { && !NetworkSecurityPolicy.getInstance()
.isCleartextTrafficPermitted(Assertions.checkNotNull(uri.getHost()))) {
// The security policy prevents cleartext traffic. // The security policy prevents cleartext traffic.
return false; return false;
} }

4
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
View file

@ -23,7 +23,9 @@ public final class SsUtil {
/** Returns a fixed SmoothStreaming client manifest {@link Uri}. */ /** Returns a fixed SmoothStreaming client manifest {@link Uri}. */
public static Uri fixManifestUri(Uri manifestUri) { public static Uri fixManifestUri(Uri manifestUri) {
if (Util.toLowerInvariant(manifestUri.getLastPathSegment()).matches("manifest(\\(.+\\))?")) { String lastPathSegment = manifestUri.getLastPathSegment();
if (lastPathSegment != null
&& Util.toLowerInvariant(lastPathSegment).matches("manifest(\\(.+\\))?")) {
return manifestUri; return manifestUri;
} }
return Uri.withAppendedPath(manifestUri, "Manifest"); return Uri.withAppendedPath(manifestUri, "Manifest");