Skip to contentSkip to conversation

dtc: Fix memory leak in character literal parsing

PATCH In review Gabriel Smith 2 participants 2 messages Dec 11, 2016 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dtc: Fix memory leak in character literal parsing

The data struct used for parsing character literals was never freed resulting in a few bytes leaked for every character.

---
 dtc-lexer.l | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
dtc-lexer.l +8 -8
index 790fbf6..f252ab9 100644
@@ -184,16 +184,16 @@ static void lexical_error(const char *fmt, ...);
 			if (d.len == 1) {
 				lexical_error("Empty character literal");
 				yylval.integer = 0;
-				return DT_CHAR_LITERAL;
-			}
-
-			yylval.integer = (unsigned char)d.val[0];
+			} else {
+				yylval.integer = (unsigned char)d.val[0];
 
-			if (d.len > 2)
-				lexical_error("Character literal has %d"
-					      " characters instead of 1",
-					      d.len - 1);
+				if (d.len > 2)
+					lexical_error("Character literal has %d"
+						      " characters instead of 1",
+						      d.len - 1);
+			}
 
+			data_free(d);
 			return DT_CHAR_LITERAL;
 		}
 
Signature · 1 line
2.7.4

A message that is not in the archive (sent off-list or not yet received): 1481487196-20830-1-git-send-email-ga29smith-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 4 lines · Gabriel Smith

The data struct used for parsing character literals was never freed resulting in a few bytes leaked for every character.

Nice catch. Merged and pushed.

Quoted 33 lines
---
 dtc-lexer.l | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
dtc-lexer.l +8 -8
index 790fbf6..f252ab9 100644
@@ -184,16 +184,16 @@ static void lexical_error(const char *fmt, ...);
 			if (d.len == 1) {
 				lexical_error("Empty character literal");
 				yylval.integer = 0;
-				return DT_CHAR_LITERAL;
-			}
-
-			yylval.integer = (unsigned char)d.val[0];
+			} else {
+				yylval.integer = (unsigned char)d.val[0];
 
-			if (d.len > 2)
-				lexical_error("Character literal has %d"
-					      " characters instead of 1",
-					      d.len - 1);
+				if (d.len > 2)
+					lexical_error("Character literal has %d"
+						      " characters instead of 1",
+						      d.len - 1);
+			}
 
+			data_free(d);
 			return DT_CHAR_LITERAL;
 		}
 
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson