Commit 6c5243bf authored by jehan's avatar jehan

fix compilation issue

parent d7bd4d9e
......@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
/***************/
/* logging api */
......
......@@ -387,7 +387,11 @@ static void test_overflow(void){
const unsigned int orig_buffsize=1024;
unsigned int buffsize=orig_buffsize;
char *buffer=belle_sip_malloc0(buffsize);
<<<<<<< HEAD
belle_sip_error_code err;
=======
unsigned int offset=0;
>>>>>>> fix compilation issue
sdp=belle_sdp_session_description_parse(big_sdp);
CU_ASSERT_PTR_NOT_NULL(sdp);
......@@ -398,10 +402,17 @@ static void test_overflow(void){
for(i=0;i<16;i++){
belle_sdp_media_description_add_attribute(vmd,belle_sdp_attribute_create("candidate","2 1 UDP 1694498815 82.65.223.97 9078 typ srflx raddr 192.168.0.2 rport 9078"));
}
<<<<<<< HEAD
err=belle_sip_object_marshal(BELLE_SIP_OBJECT(sdp),buffer,0,&buffsize);
CU_ASSERT_TRUE(err==BELLE_SIP_OK);
belle_sip_message("marshal size is %i",(int)buffsize);
CU_ASSERT_TRUE(orig_buffsize==buffsize);
=======
CU_ASSERT_EQUAL(belle_sip_object_marshal(BELLE_SIP_OBJECT(sdp),buffer,buffsize,&offset),BELLE_SIP_BUFFER_OVERFLOW);
belle_sip_message("marshal size is %i",offset);
CU_ASSERT_TRUE(offset==buffsize);
>>>>>>> fix compilation issue
belle_sip_object_unref(sdp);
belle_sip_free(buffer);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment