diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2010-10-11 22:03:07 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2010-10-11 22:03:07 +0000 |
| commit | abe65d7ef30e6b8d498294d26b81f022817624d6 (patch) | |
| tree | d98c02ddea2220759d710ffa811522257924563f /x11/libSM | |
| parent | 058d75c6bb88bc2c57d081be9e4c9d9976229990 (diff) | |
| download | ports-abe65d7ef30e6b8d498294d26b81f022817624d6.tar.gz ports-abe65d7ef30e6b8d498294d26b81f022817624d6.zip | |
- Check for uuid(3) return values.
- Use correct argument types.
- Bump PORTREVISION.
All of this was in my original patch but it didn't make it into xorg and was
lost during last Xorg update. I'm restoring it so it won't get lost.
Notes
Notes:
svn path=/head/; revision=262840
Diffstat (limited to 'x11/libSM')
| -rw-r--r-- | x11/libSM/Makefile | 2 | ||||
| -rw-r--r-- | x11/libSM/files/patch-sm_genid.c | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index a31361c4c036..4f137f8f02d6 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -7,7 +7,7 @@ PORTNAME= libSM PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libSM/files/patch-sm_genid.c b/x11/libSM/files/patch-sm_genid.c index a74e4965ca88..6569b69de076 100644 --- a/x11/libSM/files/patch-sm_genid.c +++ b/x11/libSM/files/patch-sm_genid.c @@ -1,6 +1,21 @@ ---- src/sm_genid.c.orig 2010-05-24 14:21:20.000000000 -0400 -+++ src/sm_genid.c 2010-05-24 14:21:44.000000000 -0400 -@@ -98,7 +98,7 @@ +--- src/sm_genid.c.orig 2009-08-07 02:38:31.000000000 -0700 ++++ src/sm_genid.c 2010-10-11 15:00:42.000000000 -0700 +@@ -88,17 +88,21 @@ + { + #if defined(HAVE_UUID_CREATE) + char *id; +- char **temp; ++ char *temp; + uuid_t uuid; + uint32_t status; + + uuid_create(&uuid, &status); ++ if (status != uuid_s_ok) ++ return NULL; + + uuid_to_string(&uuid, &temp, &status); ++ if (status != uuid_s_ok) ++ return NULL; if ((id = malloc (strlen (temp) + 2)) != NULL) { |