aboutsummaryrefslogtreecommitdiff
path: root/librt
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-05 23:37:40 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-05 23:37:40 +0200
commitfdf14ae2e653f275c085329b183373e1fb062693 (patch)
treeaf64aedb51e30bda270721bf37729bcb1f4cb567 /librt
parenta76558a92e21643a628c3c6a8cd22816634b1749 (diff)
downloaduClibc-fdf14ae2e653f275c085329b183373e1fb062693.tar.gz
uClibc-fdf14ae2e653f275c085329b183373e1fb062693.tar.bz2
do not save/restore errno around free() calls
In any non-buggy program free() does not fail. And when it fails in a buggy program, the failure is usually fatal (heap corruption and segfault). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'librt')
-rw-r--r--librt/shm.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/librt/shm.c b/librt/shm.c
index f0a974059..dd2132457 100644
--- a/librt/shm.c
+++ b/librt/shm.c
@@ -25,8 +25,8 @@
* Returns a malloc'ed buffer containing the OS specific path
* to the shm filename or NULL upon failure.
*/
-static __attribute_noinline__ char* get_shm_name(const char*name) __nonnull((1));
-static char* get_shm_name(const char*name)
+static __attribute_noinline__ char* get_shm_name(const char *name) __nonnull((1));
+static char* get_shm_name(const char *name)
{
char *path;
int i;
@@ -57,7 +57,7 @@ static char* get_shm_name(const char*name)
int shm_open(const char *name, int oflag, mode_t mode)
{
- int fd, old_errno;
+ int fd;
char *shm_name = get_shm_name(name);
/* Stripped multiple '/' from start; may have set errno properly */
@@ -83,23 +83,19 @@ int shm_open(const char *name, int oflag, mode_t mode)
//}
}
#endif
- old_errno = errno;
- free(shm_name);
- errno = old_errno;
+ free(shm_name); /* doesn't affect errno */
return fd;
}
int shm_unlink(const char *name)
{
char *shm_name = get_shm_name(name);
- int ret, old_errno;
+ int ret;
/* Stripped multiple '/' from start; may have set errno properly */
if (shm_name == NULL)
return -1;
ret = unlink(shm_name);
- old_errno = errno;
- free(shm_name);
- errno = old_errno;
+ free(shm_name); /* doesn't affect errno */
return ret;
}