From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 15 Jan 2010 20:43:32 +0000 (+0000)
Subject: Merged revisions 240411 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd0774a82b7156ec7928b4b59ac22a2087ec1a96;p=thirdparty%2Fasterisk.git

Merged revisions 240411 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240411 | russell | 2010-01-15 14:41:11 -0600 (Fri, 15 Jan 2010) | 7 lines

  Ensure payload type is properly checked when comparing against cached events.

  (closes issue #16607)
  Reported by: ddv2005
  Patches:
        event.patch uploaded by ddv2005 (license 769)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/event.c b/main/event.c
index 1e2f34e8b5..445fd40c67 100644
--- a/main/event.c
+++ b/main/event.c
@@ -1273,6 +1273,7 @@ static int ast_event_cmp(void *obj, void *arg, int flags)
 
 	for (i = 0; i < ARRAY_LEN(ast_event_cache[0].cache_args) && cache_args[i]; i++) {
 		struct ast_event_ie_val ie_val = {
+			.ie_pltype = ast_event_get_ie_pltype(cache_args[i]),
 			.ie_type = cache_args[i],
 		};