gamin-doublefree_fix.patch

   1 Index: server/gam_connection.c
   2 ===================================================================
   3 RCS file: /cvs/gnome/gamin/server/gam_connection.c,v
   4 retrieving revision 1.27
   5 retrieving revision 1.29
   6 diff -u -p -r1.27 -r1.29
   7 --- server/gam_connection.c     10 Sep 2005 10:46:57 -0000      1.27
   8 +++ server/gam_connection.c     22 Sep 2005 08:09:03 -0000      1.29
   9 @@ -387,8 +387,13 @@ gam_connection_request(GamConnDataPtr co
  10             gam_listener_remove_subscription(conn->listener, sub);
  11             gam_remove_subscription(sub);
  12  #ifdef ENABLE_INOTIFY
  13 -           if (gam_inotify_is_running())
  14 -               gam_subscription_free(sub);
  15 +           if ((gam_inotify_is_running()) && (!gam_exclude_check(path))) {
  16 +               gam_fs_mon_type type;
  17 +
  18 +                type = gam_fs_get_mon_type (path);
  19 +               if (type != GFS_MT_POLL)
  20 +                   gam_subscription_free(sub);
  21 +           }
  22  #endif
  23
  24             if (gam_send_ack(conn, req->seq, path, pathlen) < 0) {
  25 @@ -396,7 +401,8 @@ gam_connection_request(GamConnDataPtr co
  26                           gam_connection_get_pid(conn));
  27             }
  28             g_free(path);
  29 -        }   break;
  30 +           break;
  31 +        }
  32          case GAM_REQ_DEBUG:
  33  #ifdef GAMIN_DEBUG_API
  34             gam_debug_add(conn, req->path, options);