commit d417b647744c43735a69629db67d97d738300595
author Maciej Żenczykowski <maze@google.com> Mon May 24 23:58:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 24 23:58:56 2021 +0000
tree 6c1ca79ce4fded6edb06c6574348cf7cc098da18
parent d9338f32194532bd11e2701411ecc3de316c80ba
parent fc592e8bc0e7cb0b6a22354a47f4128cd23bbbcb

Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: I659fb171fd5e3851cad8f9bcc6bacfea908a2125

Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp

diff --git a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
index 1611f9d..2fb5985 100644
--- a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
+++ b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
@@ -183,7 +183,7 @@
             return false;
         default:
             jniThrowExceptionFmt(env, "java/io/IOException",
-                                 "Unknown hardware address type %s on interface %s", rv,
+                                 "Unknown hardware address type %d on interface %s", rv,
                                  interface.c_str());
             return false;
     }