[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r335602 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue Sep 13 12:20:10 2011
New Revision: 335602

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335602
Log:
  Think ive finnaly figgured this SVN properties thing out.
  Commiting Conflicts 

  r335497 | russell | 2011-09-13 02:11:36 -0500 (Tue, 13 Sep 2011) | 15 lines
  
  Fix a crash in res_ais.

  Enable Auto Merge again


Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/include/asterisk/event.h
    team/irroot/distrotech-customers-10/main/event.c
    team/irroot/distrotech-customers-10/res/ais/evt.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/10:1-335601

Modified: team/irroot/distrotech-customers-10/include/asterisk/event.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/include/asterisk/event.h?view=diff&rev=335602&r1=335601&r2=335602
==============================================================================
--- team/irroot/distrotech-customers-10/include/asterisk/event.h (original)
+++ team/irroot/distrotech-customers-10/include/asterisk/event.h Tue Sep 13 12:20:10 2011
@@ -743,6 +743,13 @@
  */
 uint16_t ast_event_iterator_get_ie_raw_payload_len(struct ast_event_iterator *iterator);
 
+/*!
+ * \brief Get the minimum length of an ast_event.
+ *
+ * \return minimum amount of memory that will be consumed by any ast_event.
+ */
+size_t ast_event_minimum_length(void);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

Modified: team/irroot/distrotech-customers-10/main/event.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/event.c?view=diff&rev=335602&r1=335601&r2=335602
==============================================================================
--- team/irroot/distrotech-customers-10/main/event.c (original)
+++ team/irroot/distrotech-customers-10/main/event.c Tue Sep 13 12:20:10 2011
@@ -1769,3 +1769,8 @@
 
 	return 0;
 }
+
+size_t ast_event_minimum_length(void)
+{
+	return sizeof(struct ast_event);
+}

Modified: team/irroot/distrotech-customers-10/res/ais/evt.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/res/ais/evt.c?view=diff&rev=335602&r1=335601&r2=335602
==============================================================================
--- team/irroot/distrotech-customers-10/res/ais/evt.c (original)
+++ team/irroot/distrotech-customers-10/res/ais/evt.c Tue Sep 13 12:20:10 2011
@@ -132,6 +132,13 @@
 		ast_log(LOG_ERROR, "Event received with size %u, which is too big\n"
 			"for the allocated size %u. Change the code to increase the size.\n",
 			(unsigned int) event_datalen, (unsigned int) len);
+		return;
+	}
+
+	if (event_datalen < ast_event_minimum_length()) {
+		ast_debug(1, "Ignoring event that's too small. %u < %u\n",
+			(unsigned int) event_datalen,
+			(unsigned int) ast_event_minimum_length());
 		return;
 	}