From 562e6c99d23684255a61d1f7e933855e8fe91037 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 16 Jun 2014 23:01:41 +0200
Subject: [PATCH] fix some memory leaks
---
alib2/src/alphabet/SymbolFromStringParser.cpp | 4 +++-
alib2/src/label/LabelFromStringParser.cpp | 4 +++-
alib2/src/regexp/RegExpFromStringParser.cpp | 4 +++-
alib2/src/string/StringFromStringParser.cpp | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/alib2/src/alphabet/SymbolFromStringParser.cpp b/alib2/src/alphabet/SymbolFromStringParser.cpp
index c54e0a1bd0..718b472f82 100644
--- a/alib2/src/alphabet/SymbolFromStringParser.cpp
+++ b/alib2/src/alphabet/SymbolFromStringParser.cpp
@@ -32,7 +32,9 @@ Symbol SymbolFromStringParser::parseSymbol() {
SymbolFromStringLexer::Token token = m_SymbolLexer.next().token();
if(token.type == SymbolFromStringLexer::TokenType::TEOF && symbol != NULL) {
- return *symbol;
+ Symbol res = std::move(*symbol);
+ delete symbol;
+ return std::move(res);
} else {
throw alib::AlibException();
}
diff --git a/alib2/src/label/LabelFromStringParser.cpp b/alib2/src/label/LabelFromStringParser.cpp
index bbdc8b17ca..4d69086ffe 100644
--- a/alib2/src/label/LabelFromStringParser.cpp
+++ b/alib2/src/label/LabelFromStringParser.cpp
@@ -31,7 +31,9 @@ Label LabelFromStringParser::parseLabel() {
LabelFromStringLexer::Token token = m_Lexer.next().token();
if(token.type == LabelFromStringLexer::TokenType::TEOF && label != NULL) {
- return *label;
+ Label res = std::move(*label);
+ delete label;
+ return std::move(res);
} else {
throw alib::AlibException();
}
diff --git a/alib2/src/regexp/RegExpFromStringParser.cpp b/alib2/src/regexp/RegExpFromStringParser.cpp
index 4f4d4faedd..a3fefdd1aa 100644
--- a/alib2/src/regexp/RegExpFromStringParser.cpp
+++ b/alib2/src/regexp/RegExpFromStringParser.cpp
@@ -25,7 +25,9 @@ RegExp RegExpFromStringParser::parseRegexp() {
RegExpFromStringLexer::Token token = m_RegexpLexer.token();
if(token.type == RegExpFromStringLexer::TokenType::TEOF && regexp != NULL) {
- return *regexp;
+ RegExp res = std::move(*regexp);
+ delete regexp;
+ return std::move(res);
} else {
throw alib::AlibException();
}
diff --git a/alib2/src/string/StringFromStringParser.cpp b/alib2/src/string/StringFromStringParser.cpp
index 086d95c757..b7393a8264 100644
--- a/alib2/src/string/StringFromStringParser.cpp
+++ b/alib2/src/string/StringFromStringParser.cpp
@@ -43,7 +43,9 @@ String StringFromStringParser::parseString() {
StringFromStringLexer::Token token = m_StringLexer.next().token();
if(token.type == StringFromStringLexer::TokenType::TEOF && string != NULL) {
- return *string;
+ String res = std::move(*string);
+ delete string;
+ return std::move(res);
} else {
throw alib::AlibException();
}
--
GitLab