Skip to content
Snippets Groups Projects
Commit 8df22fce authored by Florian Pose's avatar Florian Pose
Browse files

Fixed possible null pointer dereference in ethercat tool.

--HG--
branch : stable-1.5
parent b7c8329f
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,7 @@ const DataTypeHandler::DataType *DataTypeHandler::findDataType( ...@@ -54,7 +54,7 @@ const DataTypeHandler::DataType *DataTypeHandler::findDataType(
) )
{ {
const DataType *d; const DataType *d;
for (d = dataTypes; d->name; d++) for (d = dataTypes; d->name; d++)
if (str == d->name) if (str == d->name)
return d; return d;
...@@ -86,7 +86,7 @@ string DataTypeHandler::typeInfo() ...@@ -86,7 +86,7 @@ string DataTypeHandler::typeInfo()
const DataTypeHandler::DataType *DataTypeHandler::findDataType(uint16_t code) const DataTypeHandler::DataType *DataTypeHandler::findDataType(uint16_t code)
{ {
const DataType *d; const DataType *d;
for (d = dataTypes; d->name; d++) for (d = dataTypes; d->name; d++)
if (code == d->code) if (code == d->code)
return d; return d;
...@@ -286,7 +286,7 @@ void DataTypeHandler::outputData( ...@@ -286,7 +286,7 @@ void DataTypeHandler::outputData(
o << setfill('0'); o << setfill('0');
switch (type->code) { switch (typeCode) {
case 0x0001: // bool case 0x0001: // bool
{ {
int val = (int) *(int8_t *) data; int val = (int) *(int8_t *) data;
...@@ -378,7 +378,7 @@ void DataTypeHandler::outputData( ...@@ -378,7 +378,7 @@ void DataTypeHandler::outputData(
{ {
int8_t val = *(uint8_t *) data; int8_t val = *(uint8_t *) data;
int8_t smval = val < 0 ? (val & 0x7f) * -1 : val; int8_t smval = val < 0 ? (val & 0x7f) * -1 : val;
o << "0x" << hex << setw(2) << (int) val o << "0x" << hex << setw(2) << (int) val
<< " " << dec << (int) smval << endl; << " " << dec << (int) smval << endl;
} }
...@@ -387,7 +387,7 @@ void DataTypeHandler::outputData( ...@@ -387,7 +387,7 @@ void DataTypeHandler::outputData(
{ {
int16_t val = le16_to_cpup(data); int16_t val = le16_to_cpup(data);
int16_t smval = val < 0 ? (val & 0x7fff) * -1 : val; int16_t smval = val < 0 ? (val & 0x7fff) * -1 : val;
o << "0x" << hex << setw(4) << val o << "0x" << hex << setw(4) << val
<< " " << dec << smval << endl; << " " << dec << smval << endl;
} }
...@@ -396,7 +396,7 @@ void DataTypeHandler::outputData( ...@@ -396,7 +396,7 @@ void DataTypeHandler::outputData(
{ {
int32_t val = le32_to_cpup(data); int32_t val = le32_to_cpup(data);
int32_t smval = val < 0 ? (val & 0x7fffffffUL) * -1 : val; int32_t smval = val < 0 ? (val & 0x7fffffffUL) * -1 : val;
o << "0x" << hex << setw(8) << val o << "0x" << hex << setw(8) << val
<< " " << dec << smval << endl; << " " << dec << smval << endl;
} }
...@@ -406,7 +406,7 @@ void DataTypeHandler::outputData( ...@@ -406,7 +406,7 @@ void DataTypeHandler::outputData(
int64_t val = le64_to_cpup(data); int64_t val = le64_to_cpup(data);
int64_t smval = int64_t smval =
val < 0 ? (val & 0x7fffffffffffffffULL) * -1 : val; val < 0 ? (val & 0x7fffffffffffffffULL) * -1 : val;
o << "0x" << hex << setw(16) << val o << "0x" << hex << setw(16) << val
<< " " << dec << smval << endl; << " " << dec << smval << endl;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment