diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-20 08:06:50 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-20 08:06:50 +0800 |
| commit | 0adf77cfd78d12506a6294bd5345626d89061fa8 (patch) | |
| tree | 229b52c8a0fd5790fde693bc2187f73483cb986a | |
| parent | 8fc15fea99dee85cd7c7039a16cc58b91eda6633 (diff) | |
| download | marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar.gz marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar.bz2 marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar.lz marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar.xz marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.tar.zst marcuscom-ports-0adf77cfd78d12506a6294bd5345626d89061fa8.zip | |
Fix out-of-memory error on 64-bit platforms.
Obtained from: FreeBSD ports tree
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5711 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | databases/evolution-data-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/evolution-data-server/files/patch-camel_camel-object.c | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 6900bccbb..7d758d5cd 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.72 2006/01/31 20:36:47 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.73 2006/02/14 17:20:39 marcus Exp $ # PORTNAME= evolution-data-server PORTVERSION= 1.5.91 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.5 diff --git a/databases/evolution-data-server/files/patch-camel_camel-object.c b/databases/evolution-data-server/files/patch-camel_camel-object.c new file mode 100644 index 000000000..03e011165 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-object.c @@ -0,0 +1,22 @@ +--- camel/camel-object.c.orig Sun Feb 19 17:04:42 2006 ++++ camel/camel-object.c Sun Feb 19 17:06:06 2006 +@@ -454,7 +454,7 @@ cobject_state_read(CamelObject *obj, FIL + } + + /* we batch up the properties and set them in one go */ +- if (!(argv = g_try_malloc (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0])))) ++ if (!(argv = g_try_malloc ((guint32) (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) + return -1; + + argv->argc = 0; +@@ -534,8 +534,8 @@ cobject_state_write(CamelObject *obj, FI + + count = g_slist_length(props); + +- arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])); +- argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])); ++ arggetv = g_malloc0((guint32) (sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]))); ++ argv = g_malloc0((guint32) (sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]))); + l = props; + i = 0; + while (l) { |