From d73f0332b22d259549dfd9aaaab170a58abaef53 Mon Sep 17 00:00:00 2001 From: hpi1 Date: Sun, 16 Feb 2020 16:50:35 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20logging=20NULL=20string=20(=E2=80=98%s?= =?UTF-8?q?=E2=80=99=20directive=20argument=20is=20null)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libbluray/bdj/native/org_videolan_Libbluray.c | 2 +- src/libbluray/bluray.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index fe88cd50..3490126c 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -278,7 +278,7 @@ JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_setVirtualPackageN(JNIEnv * e path = (*env)->GetStringUTFChars(env, vpPath, NULL); } - BD_DEBUG(DBG_JNI|DBG_CRIT, "setVirtualPackageN(%s,%d)\n", path, (int)psr_init_backup); + BD_DEBUG(DBG_JNI|DBG_CRIT, "setVirtualPackageN(%s,%d)\n", path ? path : "", (int)psr_init_backup); result = bd_set_virtual_package(bd, path, (int)psr_init_backup); diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index eeffb6ab..b7355b87 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -3774,7 +3774,7 @@ static int _bd_read_file(BLURAY *bd, const char *dir, const char *file, void **d } BD_DEBUG(DBG_BLURAY, "bd_read_file(): read %"PRId64" bytes from %s"DIR_SEP"%s\n", - *size, dir, file); + *size, dir ? dir : "", file); return 1; }