From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (EUR02-HE1-obe.outbound.protection.outlook.com [40.107.1.74]) by mx.groups.io with SMTP id smtpd.web11.144.1600785803941377093 for ; Tue, 22 Sep 2020 07:43:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=O46XWzvm; spf=pass (domain: arm.com, ip: 40.107.1.74, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XKjkuFbRE9A2u08RMhpjDWsTzkMA5dYMq1zBckes6oE=; b=O46XWzvmQk8gnHdzV2QzqGhKcfhrEIj1/WoQLNn6m5/iL5Lem2W0HyNjgWJjCgd5gv0/h5FKJiOWz8wxffgmvkWeLXw9Ynx1pzdglwNDQORR3mUpgoRkavkagfuvyxrhnBc8HBVQQaUr1lst2dYzDFIxs2j8RDrBGZT6MOdwGP0= Received: from AM6PR02CA0032.eurprd02.prod.outlook.com (2603:10a6:20b:6e::45) by DB8PR08MB5082.eurprd08.prod.outlook.com (2603:10a6:10:ec::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.15; Tue, 22 Sep 2020 14:43:20 +0000 Received: from VE1EUR03FT054.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:6e:cafe::ea) by AM6PR02CA0032.outlook.office365.com (2603:10a6:20b:6e::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.13 via Frontend Transport; Tue, 22 Sep 2020 14:43:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT054.mail.protection.outlook.com (10.152.19.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.15 via Frontend Transport; Tue, 22 Sep 2020 14:43:19 +0000 Received: ("Tessian outbound 34b830c8a0ef:v64"); Tue, 22 Sep 2020 14:43:19 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a6b0d0eb947e3a74 X-CR-MTA-TID: 64aa7808 Received: from 4d5acb61c8f4.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BBD97813-EED0-45F8-AF81-3166170685A5.1; Tue, 22 Sep 2020 14:42:41 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4d5acb61c8f4.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 22 Sep 2020 14:42:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g1PKLyvgZd0vD/ME2WPlmUjHxe0pk9hO6DjDKxHrj20lAeiTdASJr6h6YDzlncOuVBBcnacigPiqLnhO4BECe6uqS0vDoXLkZSWLxWTdtpT4A8LExRVcJd0AxhsmkWezddL+YBC6dkGsxchDMufCsX0cx3QwZnSdpDHOiOuggqyXWtZ8bq3uXxXpu3Riv+9E0y11qQMus2O4TshydqvC6uTULJz5QFlbv4YG3zi1d4ffVd1zLgODpSrJxPdt4iLLMxx59ydH6YLW310MQSnOsVkJz872Y2cAYtFdiccSoKIAd+nWY+47/Ed6eSlVRKGJkE2ud/gfEpjUSvReWAMwxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XKjkuFbRE9A2u08RMhpjDWsTzkMA5dYMq1zBckes6oE=; b=fJ7hcgcJ4pkajFjDjX5zGpGH2Dg2IjaDoaC2IiY2TAv0wwuNtD2/6jyYPjjz3VzFhq2L0BpmVYhwDDUcpn7oZJXnFWkhkYNTo9CWCcD9kpSnDL481QhPq6qeRIoB0WxQoWYmdC9xkoOp/LiMrvorTjlRFw67nh/Vt/DuMwNIEqx0v9+Jkbr4k4W25bN7mVxsfbSb1kVi58S8m0pORO8wDIOLGdBSQ6UCOymiTKS3+k/Q0bqFtHDRMYLqsAvv6CacvpLsvX7CvToTmugo44f+/w0ECdFmjltIHxqaw3Pn7izO5hMSdaMY9zBJfpIZkoqtBxtOi2LeTJstGp5PVfYeMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XKjkuFbRE9A2u08RMhpjDWsTzkMA5dYMq1zBckes6oE=; b=O46XWzvmQk8gnHdzV2QzqGhKcfhrEIj1/WoQLNn6m5/iL5Lem2W0HyNjgWJjCgd5gv0/h5FKJiOWz8wxffgmvkWeLXw9Ynx1pzdglwNDQORR3mUpgoRkavkagfuvyxrhnBc8HBVQQaUr1lst2dYzDFIxs2j8RDrBGZT6MOdwGP0= Received: from DB6PR07CA0110.eurprd07.prod.outlook.com (2603:10a6:6:2c::24) by VI1PR08MB2862.eurprd08.prod.outlook.com (2603:10a6:802:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.26; Tue, 22 Sep 2020 14:42:40 +0000 Received: from DB5EUR03FT006.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2c:cafe::7e) by DB6PR07CA0110.outlook.office365.com (2603:10a6:6:2c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.8 via Frontend Transport; Tue, 22 Sep 2020 14:42:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT006.mail.protection.outlook.com (10.152.20.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3391.15 via Frontend Transport; Tue, 22 Sep 2020 14:42:40 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Tue, 22 Sep 2020 14:42:36 +0000 Received: from E107187.Arm.com (10.57.47.90) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Tue, 22 Sep 2020 14:42:36 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , Subject: [PATCH v1 1/7] DynamicTablesPkg: Fix order of assert checks Date: Tue, 22 Sep 2020 15:42:29 +0100 Message-ID: <20200922144235.76292-2-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20200922144235.76292-1-sami.mujawar@arm.com> References: <20200922144235.76292-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8dcf8b06-87dc-476c-fa27-08d85f05d8ee X-MS-TrafficTypeDiagnostic: VI1PR08MB2862:|DB8PR08MB5082: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1360;OLM:1360; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 8jdJdiY4DjtlK4GpLJGxRRCBH2aoCpG2L+BLpvMVRptSQiYQS/S880q/tM1IJ9KpjQDrTwfVvAMmjTXNcbe9vV1r5BEfI9o6u8nhGgghO/hFYlDUBtSK5NpWw68RV+g9UYV078GgaaIgT6iNvs0XMrbBWsCikeJkOs1TS446qjqG52ee7I5FwETuT8nHo2L+G+FJHJmj/hNnO+ZafdyW7HMqRFKCyZ+X/fLjPeH7HNpPgKPtgBgba2XCyNTg8WyU8opHgTABUa09Fm0Z0D+tuTDwn3QBM092nPhVfc+umLj2mUmJHXy/ZRNTEqsF3zvC5swGqtO228XYZ7PCs+n3NgshtsgPZEqPtmj96Sy5lI0V2t5Q0K4O34NEhdCskO3uMWDr/1NnmOGmeOCJehGrN5qyb1p11hVn2E9lvK0DYSMCwb1DGeI6AbRPlBrrcVOb X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966005)(47076004)(7696005)(36756003)(2616005)(316002)(44832011)(86362001)(1076003)(6916009)(6666004)(70586007)(70206006)(2906002)(54906003)(478600001)(8676002)(4326008)(5660300002)(356005)(26005)(336012)(186003)(426003)(8936002)(82740400003)(83380400001)(82310400003)(81166007);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2862 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT054.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c3ca4a43-3e04-4d64-3a97-08d85f05c1a6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4DcWTi3uSYzQRN+3rXsFMM+M0PfqNOeleKogbNp1TKibdOnZpjM36agfCbzNORMbEkABqrSm9koQXu6CsoSsugJBsM26Bdd/vnCAx25PT9lyiDakGFmUZS/y5UFL7eaI4iCh6uv+A9PcquC5u3IHZzVrZaNs5/F51sAVBG1vAc8CZGVnnaIyUeyoT+9gwf0XRTBNBQ7N8bOaXXOUFja5vPA8L/3TCoG7trKMSqQuBmfDVI4pLsgF3Za7ibaExL5V8sy5Zxk2BqmIC7BcL1VZDlP5OIyVfCSMxSY58Nj3AOwS4IusYEF5htkh67TfV6Z1/VEvt2IorBO/06l/LdjPCzwR151W8KI+0GOEqsorRfu3MUeIOH2ORhiczc0nWJDp7EMms55Eo8jyrvn/As0NzQ== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(346002)(396003)(136003)(376002)(39840400004)(46966005)(186003)(4326008)(336012)(6666004)(1076003)(47076004)(54906003)(8676002)(36756003)(426003)(36906005)(8936002)(44832011)(316002)(6916009)(70206006)(70586007)(5660300002)(81166007)(2616005)(86362001)(2906002)(26005)(82310400003)(478600001)(83380400001)(7696005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2020 14:43:19.0837 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8dcf8b06-87dc-476c-fa27-08d85f05d8ee X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT054.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5082 Content-Type: text/plain Reordered the asserts to first check if the pointer is valid before de-referencing the pointer. Signed-off-by: Sami Mujawar --- DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c index 2197e50dc714707f7ed7cc37759d3dba5a45f0e0..a705d771be1a2d59c4b0f645269eb838ff605a1a 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c @@ -90,10 +90,10 @@ FreeSsdtSerialPortTableEx ( UINTN Index; ASSERT (This != NULL); + ASSERT (AcpiTableInfo != NULL); + ASSERT (CfgMgrProtocol != NULL); ASSERT (AcpiTableInfo->TableGeneratorId == This->GeneratorID); ASSERT (AcpiTableInfo->AcpiTableSignature == This->AcpiTableSignature); - ASSERT (CfgMgrProtocol != NULL); - ASSERT (AcpiTableInfo != NULL); if ((Table == NULL) || (*Table == NULL) || -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'