From 6761765a70b6dbf5355e4fddfd405e4ac23075cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Tue, 30 Nov 2010 19:14:09 +0100
Subject: [PATCH] Fixed #2262 (False positive: Resource leak: fd)

---
 lib/checkmemoryleak.cpp | 2 +-
 test/testmemleak.cpp    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 1fdd7e1f4..8de152325 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1069,7 +1069,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
             {
                 if (alloctype == Fd)
                 {
-                    if (Token::Match(tok, "if ( 0 <= %varid% )", varid) ||
+                    if (Token::Match(tok, "if ( 0 <=|< %varid% )", varid) ||
                         Token::Match(tok, "if ( %varid% != -1 )", varid))
                     {
                         addtoken(&rettail, tok, "if(var)");
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 065923eb1..d49731f8f 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -496,6 +496,7 @@ private:
         ASSERT_EQUALS(";;ifv{}", getcode("char *s; if (foo(!s)) { }", "s"));
         ASSERT_EQUALS(";;;if{dealloc;};if{dealloc;return;}assign;returnuse;", getcode("char *buf, *tmp; tmp = realloc(buf, 40); if (!(tmp)) { free(buf); return; } buf = tmp; return buf;", "buf"));
         ASSERT_EQUALS(";;if{}", getcode("FILE *f; if (fgets(buf,100,f)){}", "f"));
+        ASSERT_EQUALS(";;alloc;if(var){dealloc;}", getcode("int fd = open(a,b); if (0 < fd) { close(fd); }", "fd"));
 
         // switch..
         ASSERT_EQUALS(";;switch{case;;break;};", getcode("char *s; switch(a){case 1: break;};", "s"));