Add support for no-fail library allocator attribute to the GUI

Author: b4n

gui/cppchecklibrarydata.cpp

@@ -272,6 +272,7 @@ static CppcheckLibraryData::MemoryResource loadMemoryResource(QXmlStreamReader &
         if (elementName == "alloc" || elementName == "realloc") {
             CppcheckLibraryData::MemoryResource::Alloc alloc;
             alloc.isRealloc = (elementName == "realloc");
+            alloc.noFail = (xmlReader.attributes().value("no-fail").toString() == "true");
             alloc.init = (xmlReader.attributes().value("init").toString() == "true");
             if (xmlReader.attributes().hasAttribute("arg")) {
                 alloc.arg = xmlReader.attributes().value("arg").toInt();
@@ -723,6 +724,8 @@ static void writeMemoryResource(QXmlStreamWriter &xmlWriter, const CppcheckLibra
             xmlWriter.writeStartElement("alloc");
         }
         xmlWriter.writeAttribute("init", bool_to_string(alloc.init));
+        if (alloc.noFail)
+            xmlWriter.writeAttribute("no-fail", bool_to_string(alloc.noFail));
         if (alloc.arg != -1) {
             xmlWriter.writeAttribute("arg", QString("%1").arg(alloc.arg));
         }

gui/cppchecklibrarydata.h

@@ -142,6 +142,7 @@ class CppcheckLibraryData {
         struct Alloc {
             bool isRealloc{};
             bool init{};
+            bool noFail{};
             int arg = -1; // -1: Has no optional "realloc-arg" attribute
             int reallocArg = -1; // -1: Has no optional "arg" attribute
             QString bufferSize;

gui/test/cppchecklibrarydata/files/memory_resource_valid.cfg

@@ -6,6 +6,7 @@
 	<realloc init="false" buffer-size="malloc:2">realloc</realloc> 
 	<alloc arg="2">UuidToString</alloc>
 	<dealloc arg="3">HeapFree</dealloc>
+	<alloc init="false" no-fail="true" buffer-size="malloc">g_malloc</alloc>
   </memory>
 
   <resource>

gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp

@@ -292,30 +292,42 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[0].alloc[0].bufferSize, QString("malloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[0].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[0].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].reallocArg, -1);
 
     QCOMPARE(libraryData.memoryresource[0].alloc[1].name, QString("calloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[1].bufferSize, QString("calloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[1].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].init, true);
+    QCOMPARE(libraryData.memoryresource[0].alloc[1].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].reallocArg, -1);
 
     QCOMPARE(libraryData.memoryresource[0].alloc[2].name, QString("realloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[2].bufferSize, QString("malloc:2"));
     QCOMPARE(libraryData.memoryresource[0].alloc[2].isRealloc, true);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[2].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].reallocArg, -1);
 
     QCOMPARE(libraryData.memoryresource[0].alloc[3].name, QString("UuidToString"));
     QCOMPARE(libraryData.memoryresource[0].alloc[3].bufferSize.isEmpty(), true);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[3].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].arg, 2);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].reallocArg, -1);
 
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].name, QString("g_malloc"));
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].bufferSize, QString("malloc"));
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].isRealloc, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].noFail, true);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].arg, -1);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].reallocArg, -1);
+
     QCOMPARE(libraryData.memoryresource[0].dealloc[0].name, QString("HeapFree"));
     QCOMPARE(libraryData.memoryresource[0].dealloc[0].arg, 3);
 
@@ -328,6 +340,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[1].alloc[0].bufferSize.isEmpty(), true);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].init, true);
+    QCOMPARE(libraryData.memoryresource[1].alloc[0].noFail, false);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].arg, 1);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].reallocArg, -1);
 
@@ -362,6 +375,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
             QCOMPARE(lhs.alloc[num].bufferSize, rhs.alloc[num].bufferSize);
             QCOMPARE(lhs.alloc[num].isRealloc, rhs.alloc[num].isRealloc);
             QCOMPARE(lhs.alloc[num].init, rhs.alloc[num].init);
+            QCOMPARE(lhs.alloc[num].noFail, rhs.alloc[num].noFail);
             QCOMPARE(lhs.alloc[num].arg, rhs.alloc[num].arg);
             QCOMPARE(lhs.alloc[num].reallocArg, rhs.alloc[num].reallocArg);
         }