зеркало из https://github.com/mozilla/gecko-dev.git
Bug 964537 - Fix intermittent access through a null pointer. r=dmajor
This commit is contained in:
Родитель
d25cdd4608
Коммит
3eb57cc81f
|
@ -1185,8 +1185,14 @@ OomVictimLogger::Observe(
|
||||||
for (size_t i = 0; i < regex_count; i++) {
|
for (size_t i = 0; i < regex_count; i++) {
|
||||||
int matching = !regexec(&(mRegexes[i]), line_begin, 0, NULL, 0);
|
int matching = !regexec(&(mRegexes[i]), line_begin, 0, NULL, 0);
|
||||||
if (matching) {
|
if (matching) {
|
||||||
// Log content of kernel message
|
// Log content of kernel message. We try to skip the ], but if for
|
||||||
line_begin = strchr(line_begin, ']') + 2;
|
// some reason (most likely due to buffer overflow/wraparound), we
|
||||||
|
// can't find the ] then we just log the entire line.
|
||||||
|
char* endOfTimestamp = strchr(line_begin, ']');
|
||||||
|
if (endOfTimestamp && endOfTimestamp[1] == ' ') {
|
||||||
|
// skip the ] and the space that follows it
|
||||||
|
line_begin = endOfTimestamp + 2;
|
||||||
|
}
|
||||||
if (!lineTimestampFound) {
|
if (!lineTimestampFound) {
|
||||||
OOM_LOG(ANDROID_LOG_WARN, "following kill message may be a duplicate");
|
OOM_LOG(ANDROID_LOG_WARN, "following kill message may be a duplicate");
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче