diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
| commit | ad94bca0d273869d6358719f4dbd515a905acd26 (patch) | |
| tree | 52ae9f056f3dd6a938434d45d5295aef87e77e0a /indra/linux_crash_logger/linux_crash_logger.cpp | |
| parent | 787ac69d75dbbd8ad79c32a5de54603351523eae (diff) | |
merge -r 56696:57082 Branch_1-13-2
Diffstat (limited to 'indra/linux_crash_logger/linux_crash_logger.cpp')
| -rw-r--r-- | indra/linux_crash_logger/linux_crash_logger.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 2e7d6ef70d..12a513c136 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -219,10 +219,8 @@ int main(int argc, char **argv) db_filep = new LLFileEncoder("DB", db_file_name.c_str()); // Get the filename of the SecondLife.log file - // *TODO tofu - get right MAX_PATH. - // *FIX: What's up with this? This #define just can't be safe. -#define MAX_PATH PATH_MAX - char tmp_sl_name[MAX_PATH]; + // *NOTE: These buffer sizes are hardcoded into a scanf() below. + char tmp_sl_name[LL_MAX_PATH]; tmp_sl_name[0] = '\0'; char tmp_space[256]; tmp_space[0] = '\0'; @@ -232,7 +230,7 @@ int main(int argc, char **argv) { // This was originally scanning for "SL Log: %[^\r\n]", which happily skipped to the next line // on debug logs (which don't have anything after "SL Log:" and tried to open a nonsensical filename. - sscanf(db_filep->mBuf.c_str(), "SL Log:%[ ]%[^\r\n]", tmp_space, tmp_sl_name); + sscanf(db_filep->mBuf.c_str(), "SL Log:%255[ ]%1023[^\r\n]", tmp_space, tmp_sl_name); } else { |