diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 15:41:41 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 15:41:41 +0000 |
| commit | 10a2d6e06c07648d0f2881ec501b31918bcc0828 (patch) | |
| tree | afd523bdd8c966d6f42ac0039696d80cfcdfdbff | |
| parent | 6f9daf9fefa4014090c3bd0c58134ead9be9cf29 (diff) | |
fixes crash in astfd.c
(closes issue #15981)
Reported by: slavon
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@228338 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/astfd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/main/astfd.c b/main/astfd.c index ca852133e..26d95ee0f 100644 --- a/main/astfd.c +++ b/main/astfd.c @@ -130,15 +130,16 @@ int __ast_fdleak_pipe(int *fds, const char *file, int line, const char *func) #undef socket int __ast_fdleak_socket(int domain, int type, int protocol, const char *file, int line, const char *func) { - char sdomain[20], stype[20], *sproto; + char sdomain[20], stype[20], *sproto = NULL; struct protoent *pe; int res = socket(domain, type, protocol); if (res < 0 || res > 1023) { return res; } - pe = getprotobynumber(protocol); - sproto = pe->p_name; + if ((pe = getprotobynumber(protocol))) { + sproto = pe->p_name; + } if (domain == PF_UNIX) { ast_copy_string(sdomain, "PF_UNIX", sizeof(sdomain)); @@ -162,7 +163,11 @@ int __ast_fdleak_socket(int domain, int type, int protocol, const char *file, in snprintf(stype, sizeof(stype), "%d", type); } - STORE_COMMON(res, "socket", "%s,%s,\"%s\"", sdomain, stype, sproto); + if (sproto) { + STORE_COMMON(res, "socket", "%s,%s,\"%s\"", sdomain, stype, sproto); + } else { + STORE_COMMON(res, "socket", "%s,%s,\"%d\"", sdomain, stype, protocol); + } return res; } |