From d928c1c5238e45eaab0ef8889ab293b723e30cfc Mon Sep 17 00:00:00 2001 From: acseh Date: Tue, 30 Apr 2024 17:25:45 +0300 Subject: [PATCH] Backed out changeset 1bf733f7f74d (bug 1893340) for causing build bustages on TestINIParser.cpp CLOSED TREE --- xpcom/base/nsINIParser.cpp | 1 + xpcom/tests/gtest/TestINIParser.cpp | 48 ----------------------------- xpcom/tests/gtest/moz.build | 1 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 xpcom/tests/gtest/TestINIParser.cpp diff --git a/xpcom/base/nsINIParser.cpp b/xpcom/base/nsINIParser.cpp index df3f1fcc0d38..1447aa6fbff2 100644 --- a/xpcom/base/nsINIParser.cpp +++ b/xpcom/base/nsINIParser.cpp @@ -243,6 +243,7 @@ nsresult nsINIParser::DeleteString(const char* aSection, const char* aKey) { mSections.Remove(aSection); } else { mSections.InsertOrUpdate(aSection, std::move(val->next)); + delete val; } return NS_OK; } diff --git a/xpcom/tests/gtest/TestINIParser.cpp b/xpcom/tests/gtest/TestINIParser.cpp deleted file mode 100644 index 9f580ddde5b4..000000000000 --- a/xpcom/tests/gtest/TestINIParser.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsCOMPtr.h" -#include "gtest/gtest.h" - -#include "nsINIParser.h" - -TEST(INIParser, DeleteString) -{ - nsINIParser* parser = new nsINIParser(); - nsresult rv = parser->InitFromString( - "[sec1]\r\ -key1=val1\r\ -key2=val2\r\ -key3=val3\r\ -key4=val4\r\ -\r\ -[sec2]\r\ -key=val\r\ -[sec3]\r\ -key=val\r\ -[sec4]\r\ -key=val"_ns); - EXPECT_NS_SUCCEEDED(rv); - - rv = parser->DeleteString("sec1", "key3"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteString("sec1", "key4"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteString("sec1", "key1"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteString("sec1", "key2"); - EXPECT_NS_SUCCEEDED(rv); - - rv = parser->DeleteSection("sec3"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteSection("sec4"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteSection("sec1"); - EXPECT_NS_SUCCEEDED(rv); - rv = parser->DeleteSection("sec2"); - EXPECT_NS_SUCCEEDED(rv); - - delete parser; -} diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build index 4d8d38e89afb..3382730628a3 100644 --- a/xpcom/tests/gtest/moz.build +++ b/xpcom/tests/gtest/moz.build @@ -26,7 +26,6 @@ UNIFIED_SOURCES += [ "TestGCPostBarriers.cpp", "TestID.cpp", "TestIDUtils.cpp", - "TestINIParser.cpp", "TestInputStreamLengthHelper.cpp", "TestJSHolderMap.cpp", "TestLogCommandLineHandler.cpp",