From a00c4d9a69bd90f3444d77b2196669cbdaf75b9e Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Fri, 9 Jan 2015 17:09:18 +0100
Subject: [PATCH] util/DwarfReader: plug file-descriptor leaks

This change fixes several file-descriptor leaks in the DwarfReader
implementation.  The patch is taken from Richard Hellwig's not yet
merged change I161f626d12ca7f2b7b9d13ba9cbc254eb55692f1.  I did not
apply any white-space cleanups to prevent conflicts when Richard's
change will be merged later.

Change-Id: Icd9c1bdeeab39e77900e2ce88b756a8cf7ade96a
---
 src/core/util/DwarfReader.cc | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/core/util/DwarfReader.cc b/src/core/util/DwarfReader.cc
index 585fe588..0a56e4ff 100644
--- a/src/core/util/DwarfReader.cc
+++ b/src/core/util/DwarfReader.cc
@@ -130,8 +130,10 @@ bool DwarfReader::read_source_files(const std::string& fileName,std::list<std::s
 	while (dwarf_next_cu_header(dbg,0,0,0,0,&header,0)==DW_DLV_OK) {
 		// Access the die
 		Dwarf_Die die;
-		if (dwarf_siblingof(dbg,0,&die,0)!=DW_DLV_OK)
+		if (dwarf_siblingof(dbg,0,&die,0)!=DW_DLV_OK) {
+			close(fd);
 			return false;
+		}
 
 		// Get the source lines
 		Dwarf_Line* lineBuffer;
@@ -142,17 +144,25 @@ bool DwarfReader::read_source_files(const std::string& fileName,std::list<std::s
 		// Store them
 		for (int index=0;index<lineCount;index++) {
 			Dwarf_Unsigned lineNo;
-			if (dwarf_lineno(lineBuffer[index],&lineNo,0)!=DW_DLV_OK)
+			if (dwarf_lineno(lineBuffer[index],&lineNo,0)!=DW_DLV_OK){
+				close(fd);
 				return false;
+			}
 			char* lineSource;
-			if (dwarf_linesrc(lineBuffer[index],&lineSource,0)!=DW_DLV_OK)
+			if (dwarf_linesrc(lineBuffer[index],&lineSource,0)!=DW_DLV_OK){
+				close(fd);
 				return false;
+			}
 			Dwarf_Bool isCode;
-			if (dwarf_linebeginstatement(lineBuffer[index],&isCode,0)!=DW_DLV_OK)
+			if (dwarf_linebeginstatement(lineBuffer[index],&isCode,0)!=DW_DLV_OK){
+				close(fd);
 				return false;
+			}
 			Dwarf_Addr addr;
-			if (dwarf_lineaddr(lineBuffer[index],&addr,0)!=DW_DLV_OK)
+			if (dwarf_lineaddr(lineBuffer[index],&addr,0)!=DW_DLV_OK){
+				close(fd);
 				return false;
+			}
 
 			if (lineNo&&isCode) {
 				//LOG << "lineNo: " << lineNo   << " addr: " << reinterpret_cast<void*>(addr) << " line source:" << normalize(lineSource) << endl;
@@ -173,8 +183,10 @@ bool DwarfReader::read_source_files(const std::string& fileName,std::list<std::s
 	lines.unique();
 
 	// Shut down libdwarf
-	if (dwarf_finish(dbg,0)!=DW_DLV_OK)
+	if (dwarf_finish(dbg,0)!=DW_DLV_OK) {
+		close(fd);
 		return false;
+	}
 
 	close(fd);
 	return true;
@@ -212,6 +224,7 @@ bool DwarfReader::read_mapping(std::string fileName, std::list<DwarfLineMapping>
 		Dwarf_Die die;
 		// XXX: "if there are no sibling headers, die" | semantics unclear!
 		if (dwarf_siblingof(dbg,0,&die,0)!=DW_DLV_OK) {
+			close(fd);
 			return false;
 		}
 
@@ -219,6 +232,7 @@ bool DwarfReader::read_mapping(std::string fileName, std::list<DwarfLineMapping>
 		Dwarf_Line* lineBuffer;
 		Dwarf_Signed lineCount;
 		if (dwarf_srclines(die,&lineBuffer,&lineCount,0)!=DW_DLV_OK) {
+			close(fd);
 			continue; //return false;
 		}
 
@@ -226,18 +240,22 @@ bool DwarfReader::read_mapping(std::string fileName, std::list<DwarfLineMapping>
 		for (int index=0;index<lineCount;index++) {
 			Dwarf_Unsigned lineNo;
 			if (dwarf_lineno(lineBuffer[index],&lineNo,0)!=DW_DLV_OK) {
+				close(fd);
 				return false;
 			}
 			char* lineSource;
 			if (dwarf_linesrc(lineBuffer[index],&lineSource,0)!=DW_DLV_OK) {
+				close(fd);
 				return false;
 			}
 			Dwarf_Bool isCode;
 			if (dwarf_linebeginstatement(lineBuffer[index],&isCode,0)!=DW_DLV_OK) {
+				close(fd);
 				return false;
 			}
 			Dwarf_Addr addr;
 			if (dwarf_lineaddr(lineBuffer[index],&addr,0)!=DW_DLV_OK) {
+				close(fd);
 				return false;
 			}
 
@@ -260,6 +278,7 @@ bool DwarfReader::read_mapping(std::string fileName, std::list<DwarfLineMapping>
 
 	// Shut down libdwarf
 	if (dwarf_finish(dbg,0)!=DW_DLV_OK) {
+		close(fd);
 		return false;
 	}