qulogic/libgnt

Fix crash when scanning libgnt
gtkdoc-conversion
2014-02-06, Ankit Vani
e2ec44b8c194
Parents e36f4f54fa1a
Children 8b3814e86924
Fix crash when scanning libgnt
2 files changed, 14 insertions(+), 4 deletions(-)
  • +3 -3
    gntkeys.h
  • +11 -1
    gntstyle.c
    • --- a/gntkeys.h Thu Feb 06 20:47:29 2014 +0530
    +++ b/gntkeys.h Thu Feb 06 22:49:40 2014 +0530
    @@ -42,7 +42,7 @@
    extern char *gnt_key_cleft;
    extern char *gnt_key_cright;
    -#define SAFE(x) ((x) ? (x) : "")
    +#define SAFE(x) ((cur_term && (x)) ? (x) : "")
    #define GNT_KEY_POPUP SAFE(key_f16) /* Apparently */
    @@ -62,12 +62,12 @@
    #define GNT_KEY_HOME SAFE(key_home)
    #define GNT_KEY_END SAFE(key_end)
    -#define GNT_KEY_ENTER carriage_return
    +#define GNT_KEY_ENTER SAFE(carriage_return)
    #define GNT_KEY_BACKSPACE SAFE(key_backspace)
    #define GNT_KEY_DEL SAFE(key_dc)
    #define GNT_KEY_INS SAFE(key_ic)
    -#define GNT_KEY_BACK_TAB (back_tab ? back_tab : SAFE(key_btab))
    +#define GNT_KEY_BACK_TAB ((cur_term && back_tab) ? back_tab : SAFE(key_btab))
    #define GNT_KEY_CTRL_A "\001"
    #define GNT_KEY_CTRL_B "\002"
    --- a/gntstyle.c Thu Feb 06 20:47:29 2014 +0530
    +++ b/gntstyle.c Thu Feb 06 22:49:40 2014 +0530
    @@ -48,7 +48,13 @@
    char *gnt_style_get_from_name(const char *group, const char *key)
    {
    - const char *prg = g_get_prgname();
    + const char *prg;
    +
    + /* gkfile is NULL when run by gtkdoc-scanobj or g-ir-scanner */
    + if (!gkfile)
    + return NULL;
    +
    + prg = g_get_prgname();
    if ((group == NULL || *group == '\0') && prg &&
    g_key_file_has_group(gkfile, prg))
    group = prg;
    @@ -202,6 +208,10 @@
    char *name;
    GError *error = NULL;
    + /* gkfile is NULL when run by gtkdoc-scanobj or g-ir-scanner */
    + if (!gkfile)
    + return;
    +
    name = g_strdup_printf("%s::binding", g_type_name(type));
    if (g_key_file_has_group(gkfile, name))