From f4cd4a63ac11f1a36a68654524a7939aef168ea5 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Fri, 10 Jul 2020 16:01:22 +0200
Subject: [PATCH] Removed unnecessary deallocation (bug 564585)
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
Change-Id: I4d20e7e45f2fd2ca5e561552c15d5c52647f33b2
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
core/Charstring.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/core/Charstring.cc b/core/Charstring.cc
index 55c9928e3..5473bc240 100644
--- a/core/Charstring.cc
+++ b/core/Charstring.cc
@@ -169,10 +169,10 @@ CHARSTRING::CHARSTRING(const UNIVERSAL_CHARSTRING& other_value)
for (int i = 0; i < n_chars; ++i) {
const universal_char& uc = other_value.val_ptr->uchars_ptr[i];
if (uc.uc_group != 0 || uc.uc_plane != 0 || uc.uc_row != 0 || uc.uc_cell > 127) {
- Free(val_ptr);
- TTCN_error("Non-ASCII characters cannot be used to initialize a charstring, "
- "invalid character char(%u, %u, %u, %u) at index %d.",
- uc.uc_group, uc.uc_plane, uc.uc_row, uc.uc_cell, i);
+ Free(val_ptr);
+ TTCN_error("Non-ASCII characters cannot be used to initialize a charstring, "
+ "invalid character char(%u, %u, %u, %u) at index %d.",
+ uc.uc_group, uc.uc_plane, uc.uc_row, uc.uc_cell, i);
}
val_ptr->chars_ptr[i] = other_value.val_ptr->uchars_ptr[i].uc_cell;
}
@@ -244,7 +244,6 @@ CHARSTRING& CHARSTRING::operator=(const UNIVERSAL_CHARSTRING& other_value)
for (int i = 0; i < n_chars; ++i) {
const universal_char& uc = other_value.val_ptr->uchars_ptr[i];
if (uc.uc_group != 0 || uc.uc_plane != 0 || uc.uc_row != 0 || uc.uc_cell > 127) {
- Free(val_ptr);
TTCN_error("Non-ASCII characters cannot be assigned to a charstring, "
"invalid character char(%u, %u, %u, %u) at index %d.",
uc.uc_group, uc.uc_plane, uc.uc_row, uc.uc_cell, i);
--
GitLab