RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Mar-2008 17:45:41
Branch: HEAD Handle: 2008030216454000
Modified files:
rpm/rpmio rpmrpc.c
Log:
- jbj: ensure NUL termination with the g_strndup replacement as well.
Summary:
Revision Changes Path
2.74 +2 -7 rpm/rpmio/rpmrpc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
============================================================================
$ cvs diff -u -r2.73 -r2.74 rpmrpc.c
--- rpm/rpmio/rpmrpc.c 2 Mar 2008 16:41:51 -0000 2.73
+++ rpm/rpmio/rpmrpc.c 2 Mar 2008 16:45:40 -0000 2.74
@@ -859,13 +859,8 @@
char *t;
if (filename){
-#ifdef HACK
- t = g_strndup (p_copy + column_ptr [idx], column_ptr [idx2] -
column_ptr [idx] - 1);
-#else
- int nb = column_ptr [idx2] - column_ptr [idx] - 1;
- t = xmalloc(nb+1);
- strncpy(t, p_copy + column_ptr [idx], nb);
-#endif
+ size_t nb = column_ptr [idx2] - column_ptr [idx] - 1;
+ t = strncpy(xcalloc(1, nb+1), p_copy + column_ptr [idx], nb);
*filename = t;
}
if (linkname){
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
