From 4165e00d67f90136733bf90b3e21b9bc091f03c2 Mon Sep 17 00:00:00 2001
From: Hridya Valsaraju <hridya@google.com>
Date: Tue, 9 Oct 2018 10:40:35 -0700
Subject: [PATCH] Check validity of partition for getvar:partition-type

Test: fastboot getvar partition-type:product_services_a
Bug: 79480454

Change-Id: I4020b0c94daf8fb86c29104aecc1eb8f44f89999
---
 fastboot/device/variables.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fastboot/device/variables.cpp b/fastboot/device/variables.cpp
index 2de79b18d..25042c9d6 100644
--- a/fastboot/device/variables.cpp
+++ b/fastboot/device/variables.cpp
@@ -309,7 +309,14 @@ bool GetPartitionType(FastbootDevice* device, const std::vector<std::string>& ar
         *message = "Missing argument";
         return false;
     }
+
     std::string partition_name = args[0];
+    if (!FindPhysicalPartition(partition_name) &&
+        !LogicalPartitionExists(partition_name, device->GetCurrentSlot())) {
+        *message = "Invalid partition";
+        return false;
+    }
+
     auto fastboot_hal = device->fastboot_hal();
     if (!fastboot_hal) {
         *message = "Fastboot HAL not found";