ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-06-01 05:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

* glib/Signal.cs: Improve protection against invalid signals.

Browse source 
svn path=/trunk/gtk-sharp/; revision=121045
This commit is contained in:
Andrés G. Aragoneses 2008-12-08 21:54:20 +00:00
parent 66be12eebe
commit 470776ccea
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2008-12-08 Andrés G. Aragoneses <aaragoneses@novell.com>
* glib/Signal.cs: Improve protection against invalid signals.
2008-12-02 Stephane Delcroix <sdelcroix@novell.com> 2008-12-02 Stephane Delcroix <sdelcroix@novell.com>
* generator/Ctor.cs: * generator/Ctor.cs:

6
glib/Signal.cs
View file

@ -295,7 +295,7 @@ namespace GLib {
gquark = 0; gquark = 0;
signal_name = signal_detail; signal_name = signal_detail;
} else if (link_pos == 0) { } else if (link_pos == 0) {
throw new FormatException ("Invalid detailed_signal: " + signal_detail); throw new FormatException ("Invalid detailed signal: " + signal_detail);
} else { } else {
signal_name = signal_detail.Substring (0, link_pos); signal_name = signal_detail.Substring (0, link_pos);
gquark = GetGQuarkFromString (signal_detail.Substring (link_pos + 2)); gquark = GetGQuarkFromString (signal_detail.Substring (link_pos + 2));
@ -308,6 +308,8 @@ namespace GLib {
string signal_name; string signal_name;
ParseSignalDetail (detailed_signal, out signal_name, out gquark); ParseSignalDetail (detailed_signal, out signal_name, out gquark);
signal_id = GetSignalId (signal_name, instance); signal_id = GetSignalId (signal_name, instance);
if (signal_id <= 0)
throw new ArgumentException ("Invalid signal name: " + signal_name);
GLib.Value[] vals = new GLib.Value [args.Length + 1]; GLib.Value[] vals = new GLib.Value [args.Length + 1];
GLib.ValueArray inst_and_params = new GLib.ValueArray ((uint) args.Length + 1); GLib.ValueArray inst_and_params = new GLib.ValueArray ((uint) args.Length + 1);
@ -360,7 +362,7 @@ namespace GLib {
string signal_name; string signal_name;
ParseSignalDetail (detailed_signal, out signal_name, out gquark); ParseSignalDetail (detailed_signal, out signal_name, out gquark);
uint signal_id = GetSignalId (signal_name, type.Val); uint signal_id = GetSignalId (signal_name, type.Val);
if (signal_id == 0) if (signal_id <= 0)
throw new Exception ("Invalid signal name: " + signal_name); throw new Exception ("Invalid signal name: " + signal_name);
return g_signal_add_emission_hook (signal_id, gquark, new EmissionHookMarshaler (handler_func).Callback, IntPtr.Zero, IntPtr.Zero); return g_signal_add_emission_hook (signal_id, gquark, new EmissionHookMarshaler (handler_func).Callback, IntPtr.Zero, IntPtr.Zero);
} }