rpms/vinagre/devel vinagre-0.3-option-parse-crash.patch, NONE, 1.1 vinagre.spec, 1.3, 1.4

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12654

Modified Files:
	vinagre.spec 
Added Files:
	vinagre-0.3-option-parse-crash.patch 
Log Message:
* Fri Nov 23 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-3
- Fix crasher when passing broken options on the command-line (#394671)


vinagre-0.3-option-parse-crash.patch:

--- NEW FILE vinagre-0.3-option-parse-crash.patch ---
--- vinagre-0.3/src/vinagre-main.c.old	2007-11-23 13:16:43.000000000 +0000
+++ vinagre-0.3/src/vinagre-main.c	2007-11-23 13:20:03.000000000 +0000
@@ -89,6 +89,14 @@ int main (int argc, char **argv) {
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   g_option_context_parse (context, &argc, &argv, &error);
+  if (error)
+    {
+      g_print ("%s\n%s\n",
+	       error->message,
+	       _("Run 'vinagre --help' to see a full list of available command line options"));
+      g_error_free (error);
+      return 1;
+    }
 
   if (!g_thread_supported ())
     g_thread_init (NULL);


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vinagre.spec	25 Oct 2007 16:18:00 -0000	1.3
+++ vinagre.spec	23 Nov 2007 13:25:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VNC client for the GNOME desktop
 
 Group:		Applications/System
@@ -8,6 +8,7 @@
 URL:		http://www.gnome.org/~jwendell/vinagre/
 Source0:	http://www.gnome.org/~jwendell/vinagre/downloads/%{name}-%{version}.tar.gz
 Patch0:		vinagre-0.3-no-password-crash.patch
+Patch1:		vinagre-0.3-option-parse-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .no-pass-crash
-
+%patch1 -p1 -b .options-crash
 %build
 %configure --enable-avahi=yes
 make %{?_smp_mflags}
@@ -63,6 +64,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Nov 23 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-3
+- Fix crasher when passing broken options on the command-line (#394671)
+
 * Thu Oct 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-2
 - Fix crasher when setting a favourite with no password (#352371)