diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-05-18 17:03:54 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-05-18 17:03:54 +0200 |
| commit | a3cc53f08d983d1695a8df63435216a477081e73 (patch) | |
| tree | af6ee4631c5d8ab42a4f03deff5dcfddd049eaac /src | |
| parent | bccd10f39589870673ffd09de6bc09d6e00fab72 (diff) | |
| parent | e28d9984b27bdce367ba34c23ed529a663fa7d87 (diff) | |
| download | abrt-a3cc53f08d983d1695a8df63435216a477081e73.tar.gz abrt-a3cc53f08d983d1695a8df63435216a477081e73.tar.xz abrt-a3cc53f08d983d1695a8df63435216a477081e73.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/hooks/abrt-hook-ccpp.c | 4 | ||||
| -rw-r--r-- | src/lib/report.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c index e2c1b373..12b9509f 100644 --- a/src/hooks/abrt-hook-ccpp.c +++ b/src/hooks/abrt-hook-ccpp.c @@ -626,7 +626,7 @@ int main(int argc, char** argv) error_msg_and_die("error writing %s", path); } log("saved core dump of pid %lu (%s) to %s (%llu bytes)", (long)pid, executable, path, (long long)core_size); - if (user_core_fd >= 0 && core_size >= ulimit_c) + if (user_core_fd >= 0 && (ulimit_c == 0 || core_size > ulimit_c)) { /* user coredump is too big, nuke it */ xchdir(user_pwd); @@ -668,7 +668,7 @@ int main(int argc, char** argv) unlink(core_basename); return 1; } - if (core_size >= ulimit_c) + if (ulimit_c == 0 || core_size > ulimit_c) { xchdir(user_pwd); unlink(core_basename); diff --git a/src/lib/report.c b/src/lib/report.c index 1a0125ec..08be48a8 100644 --- a/src/lib/report.c +++ b/src/lib/report.c @@ -184,7 +184,7 @@ int report(problem_data_t *pd) * reports */ char hash_str[SHA1_RESULT_LEN*2 + 1]; - g_hash_table_foreach(pd, &generate_hash, hash_str); + g_hash_table_foreach(pd, &generate_hash_for_all, hash_str); add_to_problem_data(pd, FILENAME_DUPHASH, hash_str); /* adds: |