diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-02 09:39:18 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-02 09:39:18 -0700 |
| commit | cb88d31c15a2803950e81663e4d808a31ba4f8c0 (patch) | |
| tree | 5b71201fa9b454ab8e4e818053455dc9f831f92b /extlinux | |
| parent | 63a5a1a7cac1147e80534edcef3b410e5a8119b8 (diff) | |
| download | syslinux-cb88d31c15a2803950e81663e4d808a31ba4f8c0.tar.gz | |
installers: handle asprintf() correctly
It appears that the glibc version of asprintf() is braindamaged, and
doesn't set the target pointer to NULL in the event of an error (only
returns -1). Therefore we need to check the return value. Just in
case someone else made the *opposite* error, also check the pointer.
Bleh. The glibc documentation states that *BSD sets the pointer to
NULL, but instead of following that, the glibc people put
warn_unused_result on asprintf. Sigh.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'extlinux')
| -rw-r--r-- | extlinux/main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extlinux/main.c b/extlinux/main.c index 68e6457e..daebc101 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -350,12 +350,13 @@ int ext2_fat_install_file(const char *path, int devfd, struct stat *rst) char *file, *oldfile; int fd = -1, dirfd = -1; int modbytes; + int r1, r2; - asprintf(&file, "%s%sldlinux.sys", - path, path[0] && path[strlen(path) - 1] == '/' ? "" : "/"); - asprintf(&oldfile, "%s%sextlinux.sys", - path, path[0] && path[strlen(path) - 1] == '/' ? "" : "/"); - if (!file || !oldfile) { + r1 = asprintf(&file, "%s%sldlinux.sys", + path, path[0] && path[strlen(path) - 1] == '/' ? "" : "/"); + r2 = asprintf(&oldfile, "%s%sextlinux.sys", + path, path[0] && path[strlen(path) - 1] == '/' ? "" : "/"); + if (r1 < 0 || !file || r2 < 0 || !oldfile) { perror(program); return 1; } |