#905309 e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV)

This commit is contained in:
phracek 2013-02-04 14:04:50 +01:00
parent da1e913af3
commit a634e508ea
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
diff --git a/src/lib/message.c b/src/lib/message.c
index 24afdf1..5d2c2ef 100644
--- a/src/lib/message.c
+++ b/src/lib/message.c
@@ -37,6 +37,7 @@
*
*/
+#include <assert.h>
#include "bacula.h"
#include "jcr.h"
@@ -1230,7 +1231,8 @@ e_msg(const char *file, int line, int type, int level, const char *fmt,...)
if (type == M_ABORT) {
char *p = 0;
- p[0] = 0; /* generate segmentation violation */
+ //p[0] = 0; /* generate segmentation violation */
+ assert(p!=NULL);
}
if (type == M_ERROR_TERM) {
exit(1);

View File

@ -3,7 +3,7 @@
Name: bacula
Version: 5.2.12
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@ -32,6 +32,7 @@ Patch1: bacula-5.0.2-openssl.patch
Patch2: bacula-5.2.2-queryfile.patch
Patch3: bacula-5.0.3-sqlite-priv.patch
Patch4: bacula-5.2.11-bat-build.patch
Patch5: bacula-5.2.12-seg-fault.patch
BuildRequires: desktop-file-utils
BuildRequires: perl
@ -315,6 +316,7 @@ Provides check_bacula support for Nagios.
%patch2 -p1 -b .queryfile
%patch3 -p0 -b .priv
%patch4 -p1 -b .bat-build
%patch5 -p1 -b .seg-fault
# Remove execution permissions from files we're packaging as docs later on
find updatedb -type f | xargs chmod -x
@ -904,6 +906,9 @@ fi
%changelog
* Mon Feb 04 2013 Petr Hracek <phracek@redhat.com> - 5.2.12-7
- Fix (#905309) e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV)
* Thu Jan 10 2013 Simone Caronni <negativo17@gmail.com> - 5.2.12-6
- Added missing line in bacula-sd SysV init script.