christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

cpn: Parsing of unsigned int fixed

Browse Source 
As atoi caps the value of a unsigned int bigger than (2^31 - 1) other
than just letting it overflow to the corresponding negative value on
32Bit-integer machines, it must not be used for parsing to unsigned int.

TODO: Also apply this fix to all other unsigned values (in database)
which get parsed by atoi.

Change-Id: I96e29b14d36479ab6e567c527a40feb0b5fb14e5
This commit is contained in:
Lars Rademacher
2013-12-02 17:18:32 +01:00
parent 8b5098abdd
commit e824e7a0fa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/comm/DatabaseCampaignMessage.proto.in
View File

@ -15,11 +15,11 @@ message DatabaseCampaignMessage {
// ToDo: injection_instr can be deleted if all experiments switched to // ToDo: injection_instr can be deleted if all experiments switched to
// using generic InjectionPointMessage // using generic InjectionPointMessage
required int32 injection_instr = 4 [(sql_ignore) = true]; required int32 injection_instr = 4 [(sql_ignore) = true];
optional int32 injection_instr_absolute = 5 [(sql_ignore) = true]; optional uint32 injection_instr_absolute = 5 [(sql_ignore) = true];
required int32 data_address = 6 [(sql_ignore) = true]; required uint32 data_address = 6 [(sql_ignore) = true];
required int32 data_width = 7 [(sql_ignore) = true]; required int32 data_width = 7 [(sql_ignore) = true];
required string variant = 8 [(sql_ignore) = true]; required string variant = 8 [(sql_ignore) = true];
required string benchmark = 9 [(sql_ignore) = true]; required string benchmark = 9 [(sql_ignore) = true];
required InjectionPointMessage injection_point = 10 [(sql_ignore) = true]; required InjectionPointMessage injection_point = 10 [(sql_ignore) = true];
} }

4
src/core/cpn/DatabaseCampaign.cc
View File

@ -144,7 +144,7 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) {
while ((row = mysql_fetch_row(pilots)) != 0) { while ((row = mysql_fetch_row(pilots)) != 0) {
unsigned pilot_id = atoi(row[0]); unsigned pilot_id = atoi(row[0]);
unsigned injection_instr = atoi(row[3]); unsigned injection_instr = atoi(row[3]);
unsigned data_address = atoi(row[5]); unsigned data_address = strtoul(row[5], NULL, 10);
unsigned data_width = atoi(row[6]); unsigned data_width = atoi(row[6]);
@ -161,7 +161,7 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) {
ip.addToCampaignMessage(pilot); ip.addToCampaignMessage(pilot);
if (row[4]) { if (row[4]) {
unsigned injection_instr_absolute = atoi(row[4]); unsigned injection_instr_absolute = strtoul(row[4], NULL, 10);
pilot.set_injection_instr_absolute(injection_instr_absolute); pilot.set_injection_instr_absolute(injection_instr_absolute);
} }
pilot.set_data_address(data_address); pilot.set_data_address(data_address);