diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-07-04 02:21:10 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-07-04 02:21:10 +0000 |
| commit | 342a207e3d235c55798c54c6c7417c535bf84f1a (patch) | |
| tree | 6b13fafb76b7cd22ea88c3d176df0a590fb3b1d3 /sysutils/policykit | |
| parent | 3d63e352062cdc1eef92e999a381608d1e2a3bc5 (diff) | |
Notes
Diffstat (limited to 'sysutils/policykit')
| -rw-r--r-- | sysutils/policykit/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/policykit/files/patch-src_kit_kit-string.c | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 847e325c5c05..93c1047981d1 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -8,7 +8,7 @@ PORTNAME= policykit PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ DISTNAME= PolicyKit-${PORTVERSION} diff --git a/sysutils/policykit/files/patch-src_kit_kit-string.c b/sysutils/policykit/files/patch-src_kit_kit-string.c index 2c554e5c89b8..5a89ed70954f 100644 --- a/sysutils/policykit/files/patch-src_kit_kit-string.c +++ b/sysutils/policykit/files/patch-src_kit_kit-string.c @@ -1,6 +1,6 @@ --- src/kit/kit-string.c.orig 2008-04-08 15:44:50.000000000 -0400 -+++ src/kit/kit-string.c 2008-04-22 01:00:49.000000000 -0400 -@@ -113,6 +113,28 @@ out: ++++ src/kit/kit-string.c 2008-07-03 18:17:57.000000000 -0400 +@@ -113,6 +113,33 @@ out: #else @@ -14,13 +14,18 @@ + if ( !s ) + return NULL; + -+ if ( strlen(s) > n ) -+ nAvail = n + 1; -+ else -+ nAvail = strlen(s) + 1; -+ p = malloc ( nAvail ); ++ if (memchr(s, '\0', n) != NULL) { ++ nAvail = strlen(s); ++ if ( nAvail > n ) ++ nAvail = n; ++ } else { ++ nAvail = n; ++ } ++ p = malloc ( nAvail + 1 ); ++ if ( p == NULL) ++ return NULL; + memcpy ( p, s, nAvail ); -+ p[nAvail - 1] = '\0'; ++ p[nAvail] = '\0'; + + return p; +} |