Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
belle-sip
Commits
ef4d7312
Commit
ef4d7312
authored
Jun 10, 2013
by
jehan
Browse files
fix merge issue
parent
6c5243bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
tester/belle_sdp_tester.c
View file @
ef4d7312
...
...
@@ -387,11 +387,7 @@ 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
);
...
...
@@ -402,17 +398,10 @@ 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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment