components/encumbered/rtmpdump/patches/05-CVE-2015-8272.patch

   1 From 4312322107a94c81d3ec5b98f91bc6b923551dc5 Mon Sep 17 00:00:00 2001
   2 From: Howard Chu <hyc@highlandsun.com>
   3 Date: Mon, 14 Dec 2015 18:43:14 +0000
   4 Subject: [PATCH] Ignore requests without playpath
   5
   6 ---
   7  rtmpsrv.c | 6 ++++--
   8  1 file changed, 4 insertions(+), 2 deletions(-)
   9
  10 diff --git a/rtmpsrv.c b/rtmpsrv.c
  11 index a9e9045..5df4d3a 100644
  12 --- a/rtmpsrv.c
  13 +++ b/rtmpsrv.c
  14 @@ -404,10 +404,10 @@ countAMF(AMFObject *obj, int *argc)
  15  static char *
  16  dumpAMF(AMFObject *obj, char *ptr, AVal *argv, int *argc)
  17  {
  18 -  int i, len, ac = *argc;
  19 +  int i, ac = *argc;
  20    const char opt[] = "NBSO Z";
  21
  22 -  for (i=0, len=0; i < obj->o_num; i++)
  23 +  for (i=0; i < obj->o_num; i++)
  24      {
  25        AMFObjectProperty *p = &obj->o_props[i];
  26        argv[ac].av_val = ptr+1;
  27 @@ -595,6 +595,8 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int
  28        uint32_t now;
  29        RTMPPacket pc = {0};
  30        AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &r->Link.playpath);
  31 +      if (!r->Link.playpath.av_len)
  32 +        return 0;
  33        /*
  34        r->Link.seekTime = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 4));
  35        if (obj.o_num > 5)
  36 --
  37 1.9.1
  38