[Pspp-commits] [SCM] GNU PSPP branch, master, updated. v0.7.9-248-g50652d2

[Ben Pfaff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU PSPP".

The branch, master has been updated
       via  50652d204ce6aae87f6a165a499cf5d460f1f557 (commit)
       via  7e152a7394dd2325e9040dd59cc5bba6d4b9dde5 (commit)
      from  d8425a93fe6acff92dabff8e5fdace9e9138fc3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50652d204ce6aae87f6a165a499cf5d460f1f557
Author: Ben Pfaff <address@hidden>
Date:   Sat Jul 7 13:00:19 2012 -0700

    psppire-dict: Make PsppireDict not own its "struct dictionary".
    
    I see two places where PsppireDict are created.  The first is in
    psppire-data-window.c.  In this case, the PsppireDataWindow is
    borrowing a dictionary owned by a "struct dataset" for use in its
    PsppireDict.  When it destroys the PsppireDict, therefore, the
    dictionary must not be destroyed because the dataset still owns it.
    However, this is not what actually happens, and doing the
    following:
    
    1. Start psppire
    2. File | Open and load x.sav (dataset1)
    3. File | New | Data (a new data window will appear: dataset2)
    4. Using the window manager close the window for dataset1
    5. In dataset2:  File | Open and load x.sav
    
    or similar will cause a use-after-free error.
    
    The second use is in text-data-import-dialog.c.  This code does own
    the struct dictionary, but it can simply free it itself at the same
    time as the PsppireDict.
    
    There is still some underlying issue with the above scenario,
    because it still reports a GtkCritical, but valgrind no longer
    reports a use-after-free error.
    
    Reported by John Darrington.

commit 7e152a7394dd2325e9040dd59cc5bba6d4b9dde5
Author: Ben Pfaff <address@hidden>
Date:   Sun Jul 8 22:12:49 2012 -0700

    gui: Fix Glib-GObject-WARNING when closing the active dataset.
    
    The DATASET CLOSE command, when it acts on the active dataset, just
    removes the active dataset's name, changing it to the empty string.
    (This is the documented behavior.)  However, the GUI relies on
    every dataset having a name, so this caused the following warning:
    
    GLib-GObject-WARNING **: value """" of type `gchararray' is invalid
    or out of range for property `id' of type `gchararray'
    
    This commit fixes the problem by giving any unnamed dataset a name
    after running syntax.

-----------------------------------------------------------------------

Summary of changes:
 src/data/session.c                   |   23 ++++++++++++++++++++++-
 src/data/session.h                   |    4 +++-
 src/ui/gui/executor.c                |   18 +++++++++++++++++-
 src/ui/gui/psppire-data-window.c     |    5 +----
 src/ui/gui/psppire-dict.c            |   10 +++++-----
 src/ui/gui/text-data-import-dialog.c |    2 +-
 6 files changed, 49 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU PSPP