Skip to content

Commit

Permalink
Merge pull request #54 from yast/fix_segfault_during_install
Browse files Browse the repository at this point in the history
Fix segfault during install
  • Loading branch information
jreidinger committed Oct 2, 2013
2 parents d500928 + 4e28405 commit e56068a
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
2 changes: 2 additions & 0 deletions base/src/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
scr
y2base
*.log
*.trs
3 changes: 3 additions & 0 deletions base/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ scr_LDFLAGS = \
$(top_builddir)/scr/src/libpy2scr.la \
$(top_builddir)/wfm/src/libpy2wfm.la \
-Xlinker --no-whole-archive

TESTS = scr-smoke-test
EXTRA_DIST = $(TESTS)
7 changes: 7 additions & 0 deletions base/src/scr-smoke-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#! /bin/bash

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# smoke test:
echo "WHEN" "simply run with noting to do"
echo " IT" "exits with no error (in particular it does not segfault)"
$DIR/scr stdio scr < /dev/null
2 changes: 0 additions & 2 deletions liby2/src/genericfrontend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -772,9 +772,7 @@ main (int argc, char **argv)
server->result(result);

// Cleanup
delete server;
delete[] server_argv;
delete client;

// might be useful in tracking segmentation faults
y2milestone ("Finished YaST2 component '%s'", progname);
Expand Down
4 changes: 4 additions & 0 deletions liby2/src/include/y2/Y2ComponentBroker.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ class Y2ComponentBroker
* If set to false only servers are created.
* @return A pointer to the new component if one has been found, 0 if no
* component matching spec has been found.
* Pointer returned by this function is owned by ComponentCreator so do not
* delete it at your own.
* @see Y2ComponentCreator#create for details what ComponentCreator must
* return
*/
static Y2Component *createComponent(const char *name, bool look_for_clients);

Expand Down
7 changes: 7 additions & 0 deletions package/yast2-core.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 1 14:59:08 UTC 2013 - jreidinger@suse.com

- fixed a segfault at the end of 'scr' program used during the
installation, leading to /core file (BNC#841623)
- 3.0.2

-------------------------------------------------------------------
Wed Sep 4 14:24:39 UTC 2013 - mvidner@suse.com

Expand Down

0 comments on commit e56068a

Please sign in to comment.