rpms/gvfs/F-11 gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch, NONE, 1.1 gvfs.spec, 1.132, 1.133

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6010

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch 
Log Message:
* Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-2
- CDDA: allow query well-formed filenames only (#499266)


gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch:

--- NEW FILE gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch ---
>From 5073d2736d6a83de04e749ae5952071da3d1ccbc Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 12 May 2009 15:17:06 +0200
Subject: [PATCH 4/4] CDDA: allow query well-formed filenames only

This will check for ".wav" suffix as long as sscanf()
doesn't care of the rest of the formatting string after
last placeholder. Querying filenames like
"Track 10.nonsense" will now throw an error.

Partially fixes https://bugzilla.redhat.com/show_bug.cgi?id=499266
---
 daemon/gvfsbackendcdda.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c
index c97aa44..9b30753 100644
--- a/daemon/gvfsbackendcdda.c
+++ b/daemon/gvfsbackendcdda.c
@@ -460,7 +460,8 @@ get_track_num_from_name (GVfsBackendCdda *cdda_backend, const char *filename)
   char *basename;
 
   basename = g_path_get_basename (filename);
-  if (sscanf (basename, "Track %d.wav", &n) == 1)
+  if (sscanf (basename, "Track %d.wav", &n) == 1 &&
+      g_str_has_suffix (basename, ".wav"))
     {
       g_free (basename);
       return n;
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gvfs.spec	18 May 2009 13:17:58 -0000	1.132
+++ gvfs.spec	18 May 2009 14:14:18 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,9 @@ Patch1: gvfs-0.99.2-archive-integration.
 Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631
 Patch3: gvfs-1.2.2-dnssd-deadlock.patch
+# Unable to Play Audio CDs 
+# https://bugzilla.redhat.com/show_bug.cgi?id=499266 
+Patch4: gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -156,6 +159,7 @@ media players (Media Transfer Protocol) 
 %patch1 -p0 -b .archive-integration
 %patch2 -p1 -b .computer-expose-devices
 %patch3 -p1 -b .dnssd-deadlock
+%patch4 -p1 -b .cdda-query
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -317,6 +321,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-2
+- CDDA: allow query well-formed filenames only (#499266)
+
 * Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-1
 - Update to 1.2.3
 - Prevent deadlocks in dnssd resolver (#497631)