[gimp/metadata-browser] Bug 666949: Segfault when reading XCF file



commit fc7079aaaef726277173f72e4e1868076fce9bba
Author: Massimo Valentini <mvalentini src gnome org>
Date:   Sun Jan 22 17:58:50 2012 +0100

    Bug 666949: Segfault when reading XCF file
    
    use a guint for Tile's share_count member

 app/base/tile-manager.c |    2 +-
 app/base/tile-private.h |    2 +-
 app/base/tile.c         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/base/tile-manager.c b/app/base/tile-manager.c
index 5772661..5837309 100644
--- a/app/base/tile-manager.c
+++ b/app/base/tile-manager.c
@@ -236,7 +236,7 @@ tile_manager_get (TileManager *tm,
 
 #ifdef DEBUG_TILE_MANAGER
   if (G_UNLIKELY (tile->share_count && tile->write_count))
-    g_printerr (">> MEEPITY %d,%d <<\n", tile->share_count, tile->write_count);
+    g_printerr (">> MEEPITY %u,%d <<\n", tile->share_count, tile->write_count);
 #endif
 
   if (wantread)
diff --git a/app/base/tile-private.h b/app/base/tile-private.h
index 2b73a33..bfa92f0 100644
--- a/app/base/tile-private.h
+++ b/app/base/tile-private.h
@@ -47,7 +47,7 @@ struct _Tile
                          */
   gshort  write_count;  /* write count: number of references that are
                            for write access */
-  gshort  share_count;  /* share count: number of tile managers that
+  guint   share_count;  /* share count: number of tile managers that
                            hold this tile */
   guint   dirty : 1;    /* is the tile dirty? has it been modified? */
   guint   valid : 1;    /* is the tile valid? */
diff --git a/app/base/tile.c b/app/base/tile.c
index 2256110..9535357 100644
--- a/app/base/tile.c
+++ b/app/base/tile.c
@@ -294,7 +294,7 @@ tile_detach (Tile *tile,
   TileLink  *tmp;
 
 #ifdef TILE_DEBUG
-  g_printerr ("tile_detach: %p ~> (%p,%d) r%d *%d\n",
+  g_printerr ("tile_detach: %p ~> (%p,%d) r%d *%u\n",
               tile, tm, tile_num, tile->ref_count, tile->share_count);
 #endif
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]