diff options
| author | Zach Kissel <Zachary.Kissel@Sun.COM> | 2009-09-23 09:39:54 -0400 |
|---|---|---|
| committer | Zach Kissel <Zachary.Kissel@Sun.COM> | 2009-09-23 09:39:54 -0400 |
| commit | 42e143ab7b07db5946d8a863bd4b2627228bbe17 (patch) | |
| tree | 92916ab8ccdf24490eeb606205553abd6fca3cb4 /usr/src/cmd/cdrw | |
| parent | b7555c90ec2d9d6db7a1a6fb3eeb005fd4971d7b (diff) | |
| download | illumos-joyent-42e143ab7b07db5946d8a863bd4b2627228bbe17.tar.gz | |
6842564 SUNWcdrw package dependency issue with snv_115
6841362 cdrw -b fails, core dumped
Diffstat (limited to 'usr/src/cmd/cdrw')
| -rw-r--r-- | usr/src/cmd/cdrw/device.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/usr/src/cmd/cdrw/device.c b/usr/src/cmd/cdrw/device.c index dc3d3b7b6f..237a501bd5 100644 --- a/usr/src/cmd/cdrw/device.c +++ b/usr/src/cmd/cdrw/device.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <fcntl.h> #include <errno.h> @@ -360,9 +358,15 @@ hald_findname(char *symname) char **udi, *path = NULL; int ndevs = 0, i; - /* We already have a raw path just return that */ - if (symname[0] == '/') - return (symname); + /* + * We already have a raw path lets return it in a copied buffer + * as our caller assumes that they need to free memory. + */ + if (symname[0] == '/') { + path = my_zalloc(strlen(symname) + 1); + (void) strlcpy(path, symname, (strlen(symname) + 1)); + return (path); + } /* Get the raw device from the hal record */ if (vol_running != 0) { |