rpms/openobex/devel openobex-1.3-ircp.patch, NONE, 1.1 openobex.spec, 1.30, 1.31

[Jiří Moskovčák (jmoskovc)]

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5147

Modified Files:
	openobex.spec 
Added Files:
	openobex-1.3-ircp.patch 
Log Message:
fixed problem when ircp tries to write files to / (rhbz#451493)


openobex-1.3-ircp.patch:

--- NEW FILE openobex-1.3-ircp.patch ---
diff -druN openobex-1.3/ircp/ircp_io.c openobex-1.3_ircp_io/ircp/ircp_io.c
--- openobex-1.3/ircp/ircp_io.c	2006-01-18 15:02:14.000000000 +0200
+++ openobex-1.3_ircp_io/ircp/ircp_io.c	2008-06-14 11:25:53.000000000 +0300
@@ -127,8 +127,11 @@
 		return -1;
 
 	//TODO! Rename file if already exist.
-
-	snprintf(diskname, MAXPATHLEN, "%s/%s", path, name);
+	if (strnlen(path,MAXPATHLEN)!=0) {
+		snprintf(diskname, MAXPATHLEN, "%s/%s", path, name);
+	} else {
+		strncpy(diskname, name, MAXPATHLEN);
+	}
 
 	DEBUG(4, "Creating file %s\n", diskname);
 
@@ -150,7 +153,11 @@
 			return -1;
 	}
 
-	snprintf(newpath, MAXPATHLEN, "%s/%s", path, dir);
+	if (strnlen(path,MAXPATHLEN)!=0) {
+		snprintf(newpath, MAXPATHLEN, "%s/%s", path, dir);
+	} else {
+		strncpy(newpath, dir, MAXPATHLEN);
+	}
 
 	DEBUG(4, "path = %s dir = %s, flags = %d\n", path, dir, flags);
 	if(stat(newpath, &statbuf) == 0) {


Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openobex.spec	5 Jun 2008 15:47:11 -0000	1.30
+++ openobex.spec	18 Jun 2008 08:54:37 -0000	1.31
@@ -11,6 +11,7 @@
 Patch2: openobex-1.3-autoconf.patch
 Patch3: openobex-1.3-ipv6.patch
 Patch4: openobex-1.3-utf.patch
+Patch5: openobex-1.3-ircp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.57, bluez-libs-devel, sed, libusb-devel
@@ -47,6 +48,7 @@
 %patch2 -p1 -b .ipv6
 %patch3 -p1 -b .autoconf
 %patch4 -p1 -b .utf
+%patch5 -p1 -b .ircp
 autoreconf --install --force
 
 %build
@@ -91,6 +93,10 @@
 
 
 %changelog
+* Wed Jun 18 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.3-13
+- fixed problem when ircp tries to write files to /
+- Resolves: #451493
+
 * Mon Jun  2 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.3-12
 - improved utf(non ascii) support
 - Resolves: #430128