diff options
| author | ume <ume@FreeBSD.org> | 2009-10-17 15:53:15 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2009-10-17 15:53:15 +0000 |
| commit | ec8bf5ddac6e54912c2ec92d2d635ad3528b7643 (patch) | |
| tree | 0d4bb1517cfd34f5c980bd960ae6b893e87d9f06 /bin | |
| parent | 04a930203d8756192a9b04505239252be040b1dd (diff) | |
| download | FreeBSD-src-ec8bf5ddac6e54912c2ec92d2d635ad3528b7643.zip FreeBSD-src-ec8bf5ddac6e54912c2ec92d2d635ad3528b7643.tar.gz | |
Check error of dlfunc(3).
MFC after: 3 days
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/csh/iconv_stub.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/csh/iconv_stub.c b/bin/csh/iconv_stub.c index 6bbbbb0..d1a9e47 100644 --- a/bin/csh/iconv_stub.c +++ b/bin/csh/iconv_stub.c @@ -61,9 +61,20 @@ dl_iconv_open(const char *tocode, const char *fromcode) if (iconvlib == NULL) return (iconv_t)-1; iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN); + if (iconv_open == NULL) + goto dlfunc_err; dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE); + if (dl_iconv == NULL) + goto dlfunc_err; dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib, ICONV_CLOSE); + if (dl_iconv_close == NULL) + goto dlfunc_err; } return iconv_open(tocode, fromcode); + +dlfunc_err: + dlclose(iconvlib); + iconvlib = NULL; + return (iconv_t)-1; } |
