head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.36
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.34
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.32
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.30
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.28
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.26
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.24
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.22
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.20
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.18
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.16
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.14
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.12
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.10
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.8
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.6
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.4
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.1.0.4
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.2
	pkgsrc-2005Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.02.13.14.44.31;	author salo;	state dead;
branches;
next	1.1;

1.1
date	2005.07.30.21.30.53;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to version 3.0.0

From Jason White, via PR pkg/32451

Changes:

- Support for OTR protocol version 2; will still interoperate with version 1
  clients (though with a warning to the user), fixes identity-binding flaw
  http://www.cypherpunks.ca/otr/Protocol-v2-3.0.0.html
@
text
@$NetBSD: patch-aa,v 1.1 2005/07/30 21:30:53 rillig Exp $

Don't do arithmetic with void pointers.

--- src/mem.c.orig	Fri Jan 21 16:02:03 2005
+++ src/mem.c	Sat Jul 30 23:28:10 2005
@@@@ -63,7 +63,7 @@@@ static void *otrl_mem_malloc(size_t n)
     ((size_t *)p)[1] = OTRL_MEM_MAGIC;
 #endif
 
-    return (p + header_size);
+    return (void *)((char *)p + header_size);
 }
 
 static int otrl_mem_is_secure(const void *p)
@@@@ -73,7 +73,7 @@@@ static int otrl_mem_is_secure(const void
 
 static void otrl_mem_free(void *p)
 {
-    void *real_p = p - header_size;
+    void *real_p = (void *)((char *)p - header_size);
     size_t n = ((size_t *)real_p)[0];
 #ifdef OTRL_MEM_MAGIC
     if (((size_t *)real_p)[1] != OTRL_MEM_MAGIC) {
@@@@ -100,7 +100,7 @@@@ static void *otrl_mem_realloc(void *p, s
 	otrl_mem_free(p);
 	return NULL;
     } else {
-	void *real_p = p - header_size;
+	void *real_p = (void *)((char *)p - header_size);
 	void *new_p;
 	size_t old_n = ((size_t *)real_p)[0];
 #ifdef OTRL_MEM_MAGIC
@@@@ -121,7 +121,7 @@@@ static void *otrl_mem_realloc(void *p, s
 
 	if (new_n < old_n) {
 	    /* Overwrite the space we're about to stop using */
-	    void *p = real_p + new_n;
+	    void *p = (void *)((char *)real_p + new_n);
 	    size_t excess = old_n - new_n;
 	    memset(p, 0xff, excess);
 	    memset(p, 0xaa, excess);
@@@@ -136,7 +136,7 @@@@ static void *otrl_mem_realloc(void *p, s
 	}
 
 	((size_t *)new_p)[0] = new_n;  /* Includes header size */
-	return (new_p + header_size);
+	return (void *)((char *)new_p + header_size);
     }
 }
 
@


1.1
log
@Added a patch to fix void* arithmetic.
@
text
@d1 1
a1 1
$NetBSD$
@