Skip to content
This repository was archived by the owner on Dec 6, 2019. It is now read-only.

(fix) printf buffer overflow #2

Open
juvenn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

(fix) printf buffer overflow #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@
Breakpad is a set of client and server components which implement a

Breakpad is a set of client and server components which implements a
crash-reporting system.


Build the lib:

```
./configure
make
g++ -fPIC -lc -shared \
-Wl,--no-undefined \
-L./src -lbreakpad \
-L./src/processor -L./src/common \
-I/usr/local/lib/jvm/jdk1.8.0_66/include/ \
-I/usr/local/lib/jvm/jdk1.8.0_66/include/linux \
-I. -I./src \
-I./src/processor \
-o libbreakpadminidump.so \
src/processor/minidump.o \
src/processor/fast_source_line_resolver.o \
src/processor/processstate.o \
src/processor/com_avos_uluru_breakpad_BreakpadMinidumpStackwalker.cc
```

```
java -Djava.library.path=/mnt/avos/uluru-stats/native \
-cp uluru-stats-0.1.0.jar \
com.avos.uluru.breakpad.BreakpadMinidumpStackwalker \
dump_file shareSymbolsPath appSymbolsPath
```


-----
Getting started in 32-bit mode (from trunk)
Configure: CXXFLAGS=-m32 CFLAGS=-m32 CPPFLAGS=-m32 ./configure
Expand Down
51 changes: 31 additions & 20 deletions src/processor/com_avos_uluru_breakpad_BreakpadMinidumpStackwalker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ using std::string;
using std::vector;

static const char kOutputSeparator = '|';
static const int lineBufferLen = 1024;

// StripSeparator takes a string |original| and returns a copy
// of the string with all occurences of |kOutputSeparator| removed.
Expand All @@ -60,21 +61,22 @@ string PrintStackMachineReadable(int thread_num, const CallStack *stack) {
string result = "";
for (int frame_index = 0; frame_index < frame_count; ++frame_index) {
const StackFrame *frame = stack->frames()->at(frame_index);
char buffer[1024];
sprintf(buffer, "%d%c%d%c", thread_num, kOutputSeparator, frame_index, kOutputSeparator);
char buffer[lineBufferLen];
snprintf(buffer, lineBufferLen, "%d%c%d%c", thread_num, kOutputSeparator, frame_index, kOutputSeparator);
result += buffer;

uint64_t instruction_address = frame->ReturnAddress();

if (frame->module) {
assert(!frame->module->code_file().empty());
sprintf(buffer, "%s", StripSeparator(PathnameStripper::File(frame->module->code_file())).c_str());
snprintf(buffer, lineBufferLen, "%s", StripSeparator(PathnameStripper::File(frame->module->code_file())).c_str());
result += buffer;
if (!frame->function_name.empty()) {
sprintf(buffer, "%c%s", kOutputSeparator, StripSeparator(frame->function_name).c_str());
snprintf(buffer, lineBufferLen, "%c%s", kOutputSeparator, StripSeparator(frame->function_name).c_str());
result += buffer;
if (!frame->source_file_name.empty()) {
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%c%s%c%d%c0x%" PRIx64,
kOutputSeparator,
StripSeparator(frame->source_file_name).c_str(),
Expand All @@ -84,7 +86,8 @@ string PrintStackMachineReadable(int thread_num, const CallStack *stack) {
instruction_address - frame->source_line_base);
result += buffer;
} else {
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%c%c%c0x%" PRIx64,
kOutputSeparator, // empty source file
kOutputSeparator, // empty source line
Expand All @@ -93,7 +96,8 @@ string PrintStackMachineReadable(int thread_num, const CallStack *stack) {
result += buffer;
}
} else {
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%c%c%c%c0x%" PRIx64,
kOutputSeparator, // empty function name
kOutputSeparator, // empty source file
Expand All @@ -104,7 +108,8 @@ string PrintStackMachineReadable(int thread_num, const CallStack *stack) {
}
} else {
// the printf before this prints a trailing separator for module name
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%c%c%c%c0x%" PRIx64,
kOutputSeparator, // empty function name
kOutputSeparator, // empty source file
Expand Down Expand Up @@ -137,15 +142,16 @@ static string PrintModulesMachineReadable(const CodeModules *modules) {
main_address = main_module->base_address();
}

char buffer[1024];
char buffer[lineBufferLen];

unsigned int module_count = modules->module_count();
for (unsigned int module_sequence = 0;
module_sequence < module_count;
++module_sequence) {
const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
uint64_t base_address = module->base_address();
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n",
kOutputSeparator,
StripSeparator(PathnameStripper::File(module->code_file())).c_str(),
Expand Down Expand Up @@ -194,20 +200,22 @@ JNIEXPORT jstring JNICALL Java_com_avos_uluru_breakpad_BreakpadMinidumpStackwalk
}

string result = "";
char buffer[1024];
char buffer[lineBufferLen];

// sprintf(buffer, "%s\n", process_state.crash_reason().c_str());
// snprintf(buffer, lineBufferLen, "%s\n", process_state.crash_reason().c_str());

// Print OS and CPU information.
// OS|{OS Name}|{OS Version}
// CPU|{CPU Name}|{CPU Info}|{Number of CPUs}
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"OS%c%s%c%s\n", kOutputSeparator,
StripSeparator(process_state.system_info()->os).c_str(),
kOutputSeparator,
StripSeparator(process_state.system_info()->os_version).c_str());
result += buffer;
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"CPU%c%s%c%s%c%d\n", kOutputSeparator,
StripSeparator(process_state.system_info()->cpu).c_str(),
kOutputSeparator,
Expand All @@ -222,10 +230,11 @@ JNIEXPORT jstring JNICALL Java_com_avos_uluru_breakpad_BreakpadMinidumpStackwalk

// Print crash information.
// Crash|{Crash Reason}|{Crash Address}|{Crashed Thread}
sprintf(buffer, "Crash%c", kOutputSeparator);
snprintf(buffer, lineBufferLen, "Crash%c", kOutputSeparator);
result += buffer;
if (process_state.crashed()) {
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%s%c0x%" PRIx64 "%c",
StripSeparator(process_state.crash_reason()).c_str(),
kOutputSeparator, process_state.crash_address(), kOutputSeparator);
Expand All @@ -235,20 +244,22 @@ JNIEXPORT jstring JNICALL Java_com_avos_uluru_breakpad_BreakpadMinidumpStackwalk
// instead of the unhelpful "No crash"
string assertion = process_state.assertion();
if (!assertion.empty()) {
sprintf(buffer,
snprintf(buffer,
lineBufferLen,
"%s%c%c", StripSeparator(assertion).c_str(),
kOutputSeparator, kOutputSeparator);
result += buffer;
} else {
sprintf(buffer, "No crash%c%c", kOutputSeparator, kOutputSeparator);
snprintf(buffer, lineBufferLen, "No crash%c%c",
kOutputSeparator, kOutputSeparator);
result += buffer;
}
}

if (requesting_thread != -1) {
sprintf(buffer, "%d\n", requesting_thread);
snprintf(buffer, lineBufferLen, "%d\n", requesting_thread);
} else {
sprintf(buffer, "\n");
snprintf(buffer, lineBufferLen, "\n");
}

result += buffer;
Expand Down