]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
srv: Fix crash when ast_srv_lookup is used and 0 records are returned. 97/4897/1
authorJoshua Colp <jcolp@digium.com>
Tue, 7 Feb 2017 18:01:03 +0000 (18:01 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 7 Feb 2017 18:12:17 +0000 (18:12 +0000)
When performing an SRV lookup using the ast_srv_lookup function it
did not properly handle the situation where 0 records are returned.
If this happened it would wrongly assume that at least one record
was present.

This change fixes the code so it will exit early if an error occurs
or if 0 records are returned.

ASTERISK-26772
patches:
  srv_lookup.patch submitted by nappsoft (license 6822)

Change-Id: I09b19081c74e0ad11c12bf54a257243b1bcb2351

main/srv.c

index 0938a0c036630f1f3ca0ad2ca7d7e42832ac6a6c..dcfcc2b6ce031f44a3d8892d4261d5a6f46b406a 100644 (file)
@@ -211,7 +211,8 @@ int ast_srv_lookup(struct srv_context **context, const char *service, const char
                }
                AST_LIST_HEAD_INIT_NOLOCK(&(*context)->entries);
 
-               if ((ast_search_dns(*context, service, C_IN, T_SRV, srv_callback)) < 0) {
+               if (((ast_search_dns(*context, service, C_IN, T_SRV, srv_callback)) < 1) ||
+                       AST_LIST_EMPTY(&(*context)->entries)) {
                        ast_free(*context);
                        *context = NULL;
                        return -1;