commit 414fcd758c6a7e1fc383869df89c1be6af29f316
author Chiachang Wang <chiachangwang@google.com> Fri Jan 19 01:33:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 19 01:33:48 2024 +0000
tree feb1515d9164f0497f2d6d501178fea53e764c51
parent 883f69538ba6e700c6b99031bdbe04193bcbefd8
parent 8ceb02c541d71e1ec8d4c6291f655916c443e8c9

Merge "Address review feedback" into main am: 8ceb02c541

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

Change-Id: Ib90158223949f82ae8c8b80e8497c417473b1e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java

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