From ef77439e39fe7bfc894e4ad41b866d3f6cf8f750 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 30 Nov 2015 16:42:47 -0600
Subject: [PATCH] sched.c: Make not return a sched id of 0.
According to the API doxygen a sched ID of 0 is valid. Unfortunately, 0
was never returned historically and several users incorrectly coded usage
of the returned sched ID assuming that 0 was invalid.
ASTERISK-25476
Change-Id: Ib19c7ebb44ec9fd393ef6646dea806d4f34e3a20
---
main/sched.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/main/sched.c b/main/sched.c
index a7e6703208..7b7021d617 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -315,9 +315,16 @@ static int add_ids(struct ast_sched_context *con)
if (!new_id) {
break;
}
- new_id->id = i;
+
+ /*
+ * According to the API doxygen a sched ID of 0 is valid.
+ * Unfortunately, 0 was never returned historically and
+ * several users incorrectly coded usage of the returned
+ * sched ID assuming that 0 was invalid.
+ */
+ new_id->id = ++con->id_queue_size;
+
AST_LIST_INSERT_TAIL(&con->id_queue, new_id, list);
- ++con->id_queue_size;
}
return con->id_queue_size - original_size;
--
GitLab