christoph/fail
1
Fork 0
Code Releases Activity

Merge "generic-tracing: fix parsing of addresses > 2GB"

Browse Source
This commit is contained in:
Horst Schirmeier
2014-06-04 17:11:24 +02:00
committed by Gerrit Code Review
parent 85ef86b22c 85d1f91b0e
commit 3ef2af3230
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/experiments/generic-tracing/experiment.cc
View File

@ -136,7 +136,7 @@ void GenericTracing::parseOptions() {
while (opt != 0) {
char *endptr;
guest_address_t begin = strtol(opt->arg, &endptr, 16);
guest_address_t begin = strtoul(opt->arg, &endptr, 16);
guest_address_t size;
if (endptr == opt->arg) {
m_log << "Couldn't parse " << opt->arg << std::endl;
@ -148,14 +148,14 @@ void GenericTracing::parseOptions() {
size = 1;
} else if (delim == ':') {
char *p = endptr +1;
size = strtol(p, &endptr, 16) - begin;
size = strtoul(p, &endptr, 16) - begin;
if (p == endptr || *endptr != 0) {
m_log << "Couldn't parse " << opt->arg << std::endl;
exit(-1);
}
} else if (delim == '+') {
char *p = endptr +1;
size = strtol(p, &endptr, 10);
size = strtoul(p, &endptr, 10);
if (p == endptr || *endptr != 0) {
m_log << "Couldn't parse " << opt->arg << std::endl;
exit(-1);