| commit | 92b724a84bd7e166f8ba0f1fb36b64f18c05d263 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Jan 19 02:14:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 19 02:14:40 2024 +0000 |
| tree | b9fd05ea59e09a132e9fafbb071328bbb279e34a | |
| parent | 23040993ffaef18281b4416d32ec8bad884d75f0 [diff] | |
| parent | 5c25dbe57bb606fba183892252ab4b29be31098d [diff] |
Merge "Address review feedback" into main am: 8ceb02c541 am: 5c25dbe57b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916427 Change-Id: I60dc255219a7cbd5f91d858fe77fedf7d23d7b59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java b/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java index 1a326b5..b980c7d 100644 --- a/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java +++ b/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java
@@ -180,7 +180,10 @@ while (payload.position() < payloadLength) { final StructNlAttr attr = StructNlAttr.parse(payload); // Stop parsing for truncated or malformed attribute - if (attr == null) return null; + if (attr == null) { + Log.wtf(TAG, "Got truncated or malformed attribute"); + return null; + } msg.nlAttrs.add(attr); }