| commit | 5c25dbe57bb606fba183892252ab4b29be31098d | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Jan 19 01:27:52 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 19 01:27:52 2024 +0000 |
| tree | 2faff4ccd35473ba59e475911f2bafc13f0fcd82 | |
| parent | a54123aa02aac46f5dcaadcf99aaed0e14bf6185 [diff] | |
| parent | 8ceb02c541d71e1ec8d4c6291f655916c443e8c9 [diff] |
Merge "Address review feedback" into main am: 8ceb02c541 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916427 Change-Id: I67d9f037ac7296677ffd33a3dc7116e2b02c539f 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); }