Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit ee6d32b

Browse files
authored
Fix SF828 for Tango 9 LTS (#321)
(Crash when a client receives attribute configuration events with non empty enum labels field) Original ticket: https://sourceforge.net/p/tango-cs/bugs/828/
1 parent a0c4408 commit ee6d32b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cppapi/client/api_util.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
static const char *RcsId = "$Id$\n$Name$";
1+
static const char *RcsId = "$Id: api_util.cpp 30271 2016-11-09 12:19:27Z bourtemb $\n$Name$";
22

33
//+==================================================================================================================
44
//
@@ -25,7 +25,7 @@ static const char *RcsId = "$Id$\n$Name$";
2525
//
2626
// original - May 2002
2727
//
28-
// $Revision$
28+
// $Revision: 30271 $
2929
//
3030
//+==================================================================================================================
3131

@@ -1847,9 +1847,10 @@ AttributeInfoEx &AttributeInfoEx::operator=(const AttributeConfig_5 *att_5)
18471847
else
18481848
memorized = MEMORIZED_WRITE_INIT;
18491849
}
1850+
enum_labels.clear();
18501851
for (unsigned int j=0; j<att_5->enum_labels.length(); j++)
18511852
{
1852-
enum_labels[j] = att_5->enum_labels[j];
1853+
enum_labels.push_back(att_5->enum_labels[j].in());
18531854
}
18541855

18551856
alarms.min_alarm = att_5->att_alarm.min_alarm;

0 commit comments

Comments
 (0)