projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix snapshot code
[model-checker.git]
/
snapshot-interface.cc
diff --git
a/snapshot-interface.cc
b/snapshot-interface.cc
index 5f8a68773eeba95fca07678ee73d6e39ace1c62d..5242d168fb4072552cda80f5069b85c3a29fd95b 100644
(file)
--- a/
snapshot-interface.cc
+++ b/
snapshot-interface.cc
@@
-64,15
+64,17
@@
static void SnapshotGlobalSegments()
char smstr[23];
char r, w, x;
char mr, mw, mx;
char smstr[23];
char r, w, x;
char mr, mw, mx;
- int size;
void *begin, *end;
//Skip out at the end of the section
if (buf[0] == '\n')
break;
void *begin, *end;
//Skip out at the end of the section
if (buf[0] == '\n')
break;
- sscanf(buf, "%22s %p-%p
[%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname
);
+ sscanf(buf, "%22s %p-%p
", type, &begin, &end
);
+ char * secondpart = strstr(buf, "]");
+
+ sscanf(&secondpart[2], "%c%c%c/%c%c%c SM=%3s %200s\n", &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
if (w == 'w' && strstr(regionname, MYBINARYNAME)) {
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
if (w == 'w' && strstr(regionname, MYBINARYNAME)) {
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
@@
-85,10
+87,16
@@
static void SnapshotGlobalSegments()
static void get_binary_name(char *buf, size_t len)
{
static void get_binary_name(char *buf, size_t len)
{
- if (readlink("/proc/self/exe", buf, len) == -1) {
+ ssize_t size = readlink("/proc/self/exe", buf, len);
+ if (size < 0) {
perror("readlink");
exit(EXIT_FAILURE);
}
perror("readlink");
exit(EXIT_FAILURE);
}
+
+ /* Terminate string */
+ if ((size_t)size > len)
+ size = len;
+ buf[size] = '\0';
}
/** The SnapshotGlobalSegments function computes the memory regions
}
/** The SnapshotGlobalSegments function computes the memory regions