From 22d775f95c68b80776d3dedbc2aa513b8399daba Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 26 Mar 2012 21:05:24 +0400 Subject: [PATCH 1/2] Fix sscanf parsing the memory map on linux, so that dfusion loads. --- library/Process-linux.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index f5503fb4f..ddc62daf8 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -131,12 +131,12 @@ void Process::getMemRanges( vector & ranges ) { t_memrange temp; temp.name[0] = 0; - sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %[^\n]s", + sscanf(buffer, "%zx-%zx %s %zx %2zx:%2zx %zu %[^\n]", &start, &end, (char*)&permissions, &offset, &device1, &device2, &node, - (char*)&temp.name); + (char*)temp.name); temp.start = (void *) start; temp.end = (void *) end; temp.read = permissions[0] == 'r'; From d2d16271f052cbf01a8c6e9fab5574739b3dd185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 27 Mar 2012 01:30:46 +0200 Subject: [PATCH 2/2] Track stonesense --- plugins/stonesense | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/stonesense b/plugins/stonesense index f854810fb..07ddc8c13 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit f854810fb76a6c83a9ccd3a50f526963b5c85b90 +Subproject commit 07ddc8c13e0bb38cde77937803e9320e2b26f2d9