commit e90875ce2f33a220ed1fe3e67d4a43cff6c61415
author Maciej Żenczykowski <maze@google.com> Tue May 25 01:05:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 25 01:05:11 2021 +0000
tree 3ef38a1cd9628dbaca1e727862babe64ba3e9f35
parent 4964eaac5af7f6217590957b3afa67078cfb52bd
parent a82bee5d642ca072f755a63bfa5468da5c34abb5

Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0 am: d417b64774 am: 705d0a9644 am: a82bee5d64

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

Change-Id: Iccc8e7325eed46b0ee8adb46e60ad4ae5067f753

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;
     }