resolved conflicts for merge of 8a064aa8 to klp-modular-dev

Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86

diff --cc media/libstagefright/MPEG4Extractor.cpp
index d306acb,8ca45ad..9366a51
--- 1/media/libstagefright/MPEG4Extractor.cpp
--- 2/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@@ -686,10 -683,13 +686,13 @@@ status_t MPEG4Extractor::parseDrmSINF(o
                  return ERROR_MALFORMED;
              }
              sinf->len = dataLen - 3;
-             sinf->IPMPData = new char[sinf->len];
+             sinf->IPMPData = new (std::nothrow) char[sinf->len];
+             if (sinf->IPMPData == NULL) {
+                 return ERROR_MALFORMED;
+             }
              data_offset += 2;
  
 -            if (mDataSource->readAt(data_offset + 2, sinf->IPMPData, sinf->len) < sinf->len) {
 +            if (mDataSource->readAt(data_offset, sinf->IPMPData, sinf->len) < sinf->len) {
                  return ERROR_IO;
              }
              data_offset += sinf->len;