[sofia-sip] scan-build: Fix dereference of null pointer in outgoing_query_results().

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 9e9891a5b46685377fe8a443e5df03c3406e2103..4aee8f62bb8975f819e2fccfdbec148ddc1573e7 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 19 21:45:20 UTC 2020
+Wed Feb 19 22:50:10 UTC 2020

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index ef939f895fd8da8c770fa1674f3e40e97bef97c2..e5f60e91eeb427b8459c4ad6d481f3a1feb133aa 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -9963,10 +9963,16 @@ static int outgoing_query_a(nta_outgoing_t *orq, struct sipdns_query *);
 static void outgoing_answer_a(sres_context_t *orq, sres_query_t *q,
                              sres_record_t *answers[]);
 
+#ifdef __clang_analyzer__
+#define FUNC_ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
+#else
+#define FUNC_ATTR_NONNULL(...)
+#endif
+
 static void outgoing_query_results(nta_outgoing_t *orq,
                                   struct sipdns_query *sq,
                                   char *results[],
-                                  size_t rlen);
+                                  size_t rlen) FUNC_ATTR_NONNULL(3);
 
 
 #define SIPDNS_503_ERROR 503, "DNS Error"
@@ -10793,7 +10799,8 @@ void outgoing_answer_aaaa(sres_context_t *orq, sres_query_t *q,
 
   sres_free_answers(orq->orq_agent->sa_resolver, answers);
 
-  outgoing_query_results(orq, sq, results, found);
+  if (results)
+    outgoing_query_results(orq, sq, results, found);
 }
 #endif /* SU_HAVE_IN6 */
 
@@ -10875,7 +10882,8 @@ void outgoing_answer_a(sres_context_t *orq, sres_query_t *q,
 
   sres_free_answers(orq->orq_agent->sa_resolver, answers);
 
-  outgoing_query_results(orq, sq, results, found);
+  if (results)
+    outgoing_query_results(orq, sq, results, found);
 }
 
 /** Store A/AAAA query results */