[rtmpdump] branch master updated. 2ad1d5d Fix upper bound check in AMF_GetProp

[gitolite]

The branch, master has been updated
       via  2ad1d5d133a46ceeaaa05c9375e293f332871f3b (commit)
       via  adb77ff4d72cea92b7c307ccb64e9aa930d866da (commit)
      from  4e06e218e230a86608637b613499984703a342cf (commit)


- Log -----------------------------------------------------------------
commit 2ad1d5d133a46ceeaaa05c9375e293f332871f3b
Author:     Josh Allmann <joshua.allmann at gmail.com>
AuthorDate: Fri Feb 24 13:46:59 2012 -0800
Commit:     Howard Chu <hyc at highlandsun.com>
CommitDate: Fri Feb 24 13:46:59 2012 -0800

    Fix upper bound check in AMF_GetProp

diff --git a/librtmp/amf.c b/librtmp/amf.c
index 659421e..ce84f81 100644
--- a/librtmp/amf.c
+++ b/librtmp/amf.c
@@ -1121,7 +1121,7 @@ AMF_GetProp(AMFObject *obj, const AVal *name, int nIndex)
 {
   if (nIndex >= 0)
     {
-      if (nIndex <= obj->o_num)
+      if (nIndex < obj->o_num)
 	return &obj->o_props[nIndex];
     }
   else

commit adb77ff4d72cea92b7c307ccb64e9aa930d866da
Author:     Joshua Allmann <joshua.allmann at gmail.com>
AuthorDate: Fri Feb 24 13:44:29 2012 -0800
Commit:     Howard Chu <hyc at highlandsun.com>
CommitDate: Fri Feb 24 13:44:29 2012 -0800

    Remove extra object end tag in Connect reply

diff --git a/rtmpsrv.c b/rtmpsrv.c
index b662d54..9aa62f3 100644
--- a/rtmpsrv.c
+++ b/rtmpsrv.c
@@ -223,9 +223,6 @@ SendConnectResult(RTMP *r, double txn)
   *enc++ = 0;
   *enc++ = 0;
   *enc++ = AMF_OBJECT_END;
-  *enc++ = 0;
-  *enc++ = 0;
-  *enc++ = AMF_OBJECT_END;
 
   packet.m_nBodySize = enc - packet.m_body;
 

-----------------------------------------------------------------------

Summary of changes:
 librtmp/amf.c |    2 +-
 rtmpsrv.c     |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)


hooks/post-receive
--