Skip to content

Commit

Permalink
Bug 1407063 - Fix non-unified build in MPEG4Extractor.cpp. r=gerald
Browse files Browse the repository at this point in the history
Calls to fallible need to be prefixed by the mozilla namespace because
it's not declared as globally usable.

MozReview-Commit-ID: CJoAoTjXGUH

--HG--
extra : rebase_source : 81618f26b4f2b16b11998673a6cad67d4bca49d4
  • Loading branch information
philn committed Oct 5, 2017
1 parent 40d1887 commit 6aa2e63
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ status_t MPEG4Extractor::parseDrmSINF(off64_t *offset, off64_t data_offset) {
return ERROR_MALFORMED;
}
sinf->len = dataLen - 3;
sinf->IPMPData = new (fallible) char[sinf->len];
sinf->IPMPData = new (mozilla::fallible) char[sinf->len];
if (!sinf->IPMPData) {
return -ENOMEM;
}
Expand Down Expand Up @@ -1047,7 +1047,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {

// Copy the contents of the box (including header) verbatim.
pssh.datalen = chunk_data_size + 8;
pssh.data = new (fallible) uint8_t[pssh.datalen];
pssh.data = new (mozilla::fallible) uint8_t[pssh.datalen];
if (!pssh.data) {
return -ENOMEM;
}
Expand Down Expand Up @@ -1679,7 +1679,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
return ERROR_MALFORMED;
}

sp<ABuffer> buffer = new (fallible) ABuffer(chunk_data_size);
sp<ABuffer> buffer = new (mozilla::fallible) ABuffer(chunk_data_size);
if (!buffer.get() || !buffer->data()) {
return -ENOMEM;
}
Expand Down Expand Up @@ -1914,7 +1914,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
if (size >= kMAX_ALLOCATION - chunk_size) {
return ERROR_MALFORMED;
}
uint8_t *buffer = new (fallible) uint8_t[size + chunk_size];
uint8_t *buffer = new (mozilla::fallible) uint8_t[size + chunk_size];
if (!buffer) {
return -ENOMEM;
}
Expand Down Expand Up @@ -1949,7 +1949,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
if (chunk_data_size <= kSkipBytesOfDataBox) {
return ERROR_MALFORMED;
}
sp<ABuffer> buffer = new (fallible) ABuffer(chunk_data_size + 1);
sp<ABuffer> buffer = new (mozilla::fallible) ABuffer(chunk_data_size + 1);
if (!buffer.get() || !buffer->data()) {
return -ENOMEM;
}
Expand Down

0 comments on commit 6aa2e63

Please sign in to comment.