qulogic/libgnt

Merged default branch
soc.2013.gobjectification.plugins
2014-04-07, Ankit Vani
fe16b3c86537
Parents 575ad3eec348250c6342039e
Children 29aec45d5fe6
Merged default branch
8 files changed, 44 insertions(+), 1 deletions(-)
  • +11 -0
    gntbox.c
  • +1 -0
    gntmain.c
  • +2 -0
    gntmenu.c
  • +16 -0
    gnttextview.c
  • +2 -1
    gnttree.c
  • +6 -0
    gntwm.c
  • +3 -0
    wms/irssi.c
  • +3 -0
    wms/s.c
    • --- a/gntbox.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gntbox.c Mon Apr 07 20:02:22 2014 +0530
    @@ -731,6 +731,11 @@
    int height, width;
    int x, y;
    + if (G_UNLIKELY(w == NULL)) {
    + g_warn_if_reached();
    + continue;
    + }
    +
    if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_INVISIBLE))
    continue;
    @@ -819,6 +824,12 @@
    for (iter = box->list; iter; iter = iter->next)
    {
    GntWidget *w = iter->data;
    +
    + if (G_UNLIKELY(w == NULL)) {
    + g_warn_if_reached();
    + continue;
    + }
    +
    if (GNT_IS_BOX(w))
    gnt_box_readjust(GNT_BOX(w));
    else
    --- a/gntmain.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gntmain.c Mon Apr 07 20:02:22 2014 +0530
    @@ -469,6 +469,7 @@
    #ifdef NO_WIDECHAR
    ascii_only = TRUE;
    + (void)locale;
    #else
    if (locale && (strstr(locale, "UTF") || strstr(locale, "utf"))) {
    ascii_only = FALSE;
    --- a/gntmenu.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gntmenu.c Mon Apr 07 20:02:22 2014 +0530
    @@ -121,6 +121,8 @@
    {
    char trigger[4] = "\0 )\0";
    + g_return_if_fail(item != NULL);
    +
    if ((trigger[1] = gnt_menuitem_get_trigger(item)) && trigger[1] != ' ')
    trigger[0] = '(';
    --- a/gnttextview.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gnttextview.c Mon Apr 07 20:02:22 2014 +0530
    @@ -335,7 +335,13 @@
    GntTextView *view = GNT_TEXT_VIEW(widget);
    if (text_view_contains(view, select_start)) {
    GString *clip;
    +
    + g_return_val_if_fail(select_start != NULL, TRUE);
    +
    select_end = gnt_text_view_get_p(view, x - widget->priv.x, y - widget->priv.y);
    +
    + g_return_val_if_fail(select_end != NULL, TRUE);
    +
    if (select_end < select_start) {
    gchar *t = select_start;
    select_start = select_end;
    @@ -758,6 +764,12 @@
    GList *segs, *snext;
    GntTextLine *line = iter->data;
    inext = iter->next;
    +
    + if (G_UNLIKELY(line == NULL)) {
    + g_warn_if_reached();
    + continue;
    + }
    +
    for (segs = line->segments; segs; segs = snext) {
    GntTextSegment *seg = segs->data;
    snext = segs->next;
    @@ -771,6 +783,10 @@
    /* This segment starts in the middle of the tag */
    if (text == NULL) {
    free_text_segment(seg, NULL);
    + if (G_UNLIKELY(line == NULL)) {
    + g_warn_if_reached();
    + break;
    + }
    line->segments = g_list_delete_link(line->segments, segs);
    if (line->segments == NULL) {
    free_text_line(line, NULL);
    --- a/gnttree.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gnttree.c Mon Apr 07 20:02:22 2014 +0530
    @@ -1314,7 +1314,8 @@
    else
    tree->root = row;
    row->next = s;
    - s->prev = row; /* s cannot be NULL */
    + g_return_if_fail(s != NULL); /* s cannot be NULL */
    + s->prev = row;
    row->prev = NULL;
    newp = g_list_index(tree->list, s) - 1;
    } else {
    --- a/gntwm.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/gntwm.c Mon Apr 07 20:02:22 2014 +0530
    @@ -2251,8 +2251,14 @@
    void gnt_wm_raise_window(GntWM *wm, GntWidget *widget)
    {
    GntWS *ws = gnt_wm_widget_find_workspace(wm, widget);
    +
    + g_return_if_fail(wm != NULL);
    +
    if (wm->cws != ws)
    gnt_wm_switch_workspace(wm, g_list_index(wm->workspaces, ws));
    +
    + g_return_if_fail(wm->cws != NULL);
    +
    if (widget != wm->cws->ordered->data) {
    GntWidget *wid = wm->cws->ordered->data;
    wm->cws->ordered = g_list_bring_to_front(wm->cws->ordered, widget);
    --- a/wms/irssi.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/wms/irssi.c Mon Apr 07 20:02:22 2014 +0530
    @@ -155,6 +155,9 @@
    const char *name;
    int x, y, w, h;
    + g_return_if_fail(win != NULL);
    + g_return_if_fail(wm != NULL);
    +
    name = gnt_widget_get_name(win);
    if (!name || !strstr(name, "conversation-window")) {
    if (!GNT_IS_MENU(win) && !GNT_WIDGET_IS_FLAG_SET(win, GNT_WIDGET_TRANSIENT)) {
    --- a/wms/s.c Sun Feb 23 02:40:51 2014 +0530
    +++ b/wms/s.c Mon Apr 07 20:02:22 2014 +0530
    @@ -84,6 +84,9 @@
    const char *name;
    gboolean blist = FALSE;
    + g_return_if_fail(win != NULL);
    + g_return_if_fail(wm != NULL);
    +
    if (!GNT_IS_MENU(win)) {
    getmaxyx(stdscr, maxy, maxx);