[asterisk-commits] branch crichter/0.3.0 r9899 - /team/crichter/0.3.0/channels/misdn/

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Feb 14 04:21:42 MST 2006


Author: crichter
Date: Tue Feb 14 05:21:39 2006
New Revision: 9899

URL: http://svn.digium.com/view/asterisk?rev=9899&view=rev
Log:
fixed a certain 64bit segfault

Modified:
    team/crichter/0.3.0/channels/misdn/Makefile
    team/crichter/0.3.0/channels/misdn/isdn_lib.c

Modified: team/crichter/0.3.0/channels/misdn/Makefile
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/misdn/Makefile?rev=9899&r1=9898&r2=9899&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/misdn/Makefile (original)
+++ team/crichter/0.3.0/channels/misdn/Makefile Tue Feb 14 05:21:39 2006
@@ -5,7 +5,10 @@
 #
 
 # Verify those options with main Makefile
-CFLAGS		= -pipe -c -Wall
+CFLAGS		= -pipe -c -Wall 
+ifeq ($(shell uname -m),x86_64)
+CFLAGS         += -fPIC
+endif
 SOURCES		= isdn_lib.c isdn_msg_parser.c 
 OBJDIR		= .
 OBJS		= isdn_lib.o isdn_msg_parser.o fac.o

Modified: team/crichter/0.3.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/misdn/isdn_lib.c?rev=9899&r1=9898&r2=9899&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/misdn/isdn_lib.c (original)
+++ team/crichter/0.3.0/channels/misdn/isdn_lib.c Tue Feb 14 05:21:39 2006
@@ -3252,7 +3252,7 @@
  */
 void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2)
 {
-	unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+sizeof(int)];
+	unsigned char buffer[mISDN_HEADER_LEN+ 2*sizeof(long)];
 	iframe_t *ctrl = (iframe_t *)buffer; /* preload data */
 	unsigned long *d = (unsigned long *)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);
@@ -3271,7 +3271,7 @@
  */
 void manager_ph_control_block(struct misdn_bchannel *bc, int c1, void *c2, int c2_len)
 {
-	unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len];
+	unsigned char buffer[mISDN_HEADER_LEN+sizeof(long)+c2_len];
 	iframe_t *ctrl = (iframe_t *)buffer;
 	unsigned long *d = (unsigned long *)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);



More information about the asterisk-commits mailing list