From 3688f9590c7e48f87ca513bc8ab7b58a54d913c0 Mon Sep 17 00:00:00 2001
From: Wang Han <wanghan1995315@gmail.com>
Date: Sun, 11 Jul 2021 08:11:33 +0000
Subject: [PATCH] Use tmpArgBuffer correctly when argBuffer is null

 * Seems to be a typo and can cause NPE.

Change-Id: I7e253c97e02767a076d9450e88ccea08c5122bb1
---
 core/java/com/android/internal/os/Zygote.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index fb9942ad262db..7ceb304fccea4 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -742,7 +742,7 @@ public final class Zygote {
                             new DataOutputStream(sessionSocket.getOutputStream());
                     Credentials peerCredentials = sessionSocket.getPeerCredentials();
                     tmpArgBuffer = new ZygoteCommandBuffer(sessionSocket);
-                    args = ZygoteArguments.getInstance(argBuffer);
+                    args = ZygoteArguments.getInstance(tmpArgBuffer);
                     applyUidSecurityPolicy(args, peerCredentials);
                     // TODO (chriswailes): Should this only be run for debug builds?
                     validateUsapCommand(args);