comparison libpurple/imgstore.c @ 22607:e09650135f04

Add a little safety... just in case someone imgstores 13 million or however many images

22606:76af23621e19

#include "debug.h"
#include "imgstore.h"
#include "util.h"

static GHashTable *imgstore;
static int nextid = 0;

/*
 * NOTE: purple_imgstore_add() creates these without zeroing the memory, so
 * NOTE: make sure to update that function when adding members.
 */

int
purple_imgstore_add_with_id(gpointer data, size_t size, const char *filename)
{
	PurpleStoredImage *img = purple_imgstore_add(data, size, filename);
	if (img) {
		img->id = ++nextid;

		g_hash_table_insert(imgstore, &(img->id), img);
	}

	return (img ? img->id : 0);

22607:e09650135f04

#include "debug.h"
#include "imgstore.h"
#include "util.h"

static GHashTable *imgstore;
static unsigned int nextid = 0;

/*
 * NOTE: purple_imgstore_add() creates these without zeroing the memory, so
 * NOTE: make sure to update that function when adding members.
 */

int
purple_imgstore_add_with_id(gpointer data, size_t size, const char *filename)
{
	PurpleStoredImage *img = purple_imgstore_add(data, size, filename);
	if (img) {
		/*
		 * Use the next unused id number.  We do it in a loop on the
		 * off chance that nextid wraps back around to 0 and the hash
		 * table still contains entries from the first time around.
		 */
		do {
			img->id = ++nextid;
		} while (img->id == 0 || g_hash_table_lookup(imgstore, &(img->id)) != NULL);

		g_hash_table_insert(imgstore, &(img->id), img);
	}

	return (img ? img->id : 0);