[gnome-usage: 1/2] Fix libgtop-2.0.vapi. Fix crashing on Fedora 26.
- From: Petr Štětka <pstetka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-usage: 1/2] Fix libgtop-2.0.vapi. Fix crashing on Fedora 26.
- Date: Tue, 11 Apr 2017 08:54:47 +0000 (UTC)
commit 55167721776a8d4ec4fa02f6960c602cbf5d7cc4
Author: Petr Štětka <pstetka redhat com>
Date: Tue Apr 11 10:54:00 2017 +0200
Fix libgtop-2.0.vapi.
Fix crashing on Fedora 26.
src/meson.build | 1 -
src/system-monitor.vala | 9 +--------
src/vapis/libgtop-2.0.vapi | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index b09a7f5..627a020 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -48,7 +48,6 @@ vala_sources = [
'better-box.c']
vala_args = [
- '--target-glib=2.38',
'--gresources=../data/org.gnome.Usage.gresource.xml',
'--pkg=rg',
'--pkg=egg',
diff --git a/src/system-monitor.vala b/src/system-monitor.vala
index eecccd4..6d7b129 100644
--- a/src/system-monitor.vala
+++ b/src/system-monitor.vala
@@ -231,7 +231,7 @@ namespace Usage
{
GTop.ProcArgs proc_args;
GTop.ProcState proc_state;
- var args = GTop.get_proc_argv (out proc_args, pid);
+ string[] args = GTop.get_proc_argv (out proc_args, pid, 0);
GTop.get_proc_state (out proc_state, pid);
string cmd = (string) proc_state.cmd;
cmd_parameter = "";
@@ -241,14 +241,7 @@ namespace Usage
for(int i = 0; i < 2; i++)
{
if(args[i] != null)
- {
secure_arguments[i] = args[i];
- for (int j = 0; j < args[i].length; j++)
- {
- if(args[i][j] == ' ')
- secure_arguments[i] = args[i].substring(0, j);
- }
- }
else
secure_arguments[i] = "";
}
diff --git a/src/vapis/libgtop-2.0.vapi b/src/vapis/libgtop-2.0.vapi
index d5b1bc0..e18d171 100644
--- a/src/vapis/libgtop-2.0.vapi
+++ b/src/vapis/libgtop-2.0.vapi
@@ -180,8 +180,8 @@ namespace GTop {
uint64 flags;
uint64 size;
}
- [CCode(array_null_terminated = "true")]
- public string[] get_proc_argv(out ProcArgs proc_args, GLib.Pid pid);
+ [CCode (array_length = false, array_null_terminated = true)]
+ public string[] get_proc_argv(out ProcArgs proc_args, GLib.Pid pid, uint length);
[CCode(cname = "glibtop_fsusage", cheader_filename = "glibtop/fsusage.h")]
public struct FsUsage {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]