diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
| commit | 8ddcb9404d65bc6b09910099988fe6a0f33fe250 (patch) | |
| tree | 2214c48219c8f3cf1b4110113467fa92d38bfa84 /src/Daemon/MiddleWare.cpp | |
| parent | 04d69684f58d851ab604b2ed5eeb04f373efd4d8 (diff) | |
| parent | b348085ac9f3d4a7ded81026bffa962a065bdf97 (diff) | |
| download | abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.gz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.xz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.zip | |
resolve conflict
Diffstat (limited to 'src/Daemon/MiddleWare.cpp')
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 70527eb..c2a122a 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -187,7 +187,7 @@ static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t add_crash_data_to_crash_report( pCrashReport, short_name, - (content.length() < CD_ATT_SIZE ? CD_TXT : CD_ATT), + CD_TXT, CD_ISEDITABLE, content ); @@ -433,6 +433,8 @@ report_status_t Report(const map_crash_report_t& pCrashReport, { report_status_t ret; + /* dbus handler passes pCrashReport from user without checking it */ + if (!CheckReport(pCrashReport)) { throw CABRTException(EXCEP_ERROR, "Report(): Some of mandatory report data are missing."); |