<div dir="ltr">Thanks Hugh<div><br></div><div style>long day and a little pain (had one of my teeth removed today ;) ) - have fixed and also added null termianting string in case someone tries to deref char* </div><div style>
<br></div><div style>Cheer</div><div style>Jason</div><div style><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Apr 2, 2013 at 8:17 PM, Hugh Waite <span dir="ltr"><<a href="mailto:hugh.waite@crocodile-rcs.com" target="_blank">hugh.waite@crocodile-rcs.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Jason,<br>
When appending the 'x' to the did, I think len is the wrong index value. It should be 'len-1' or 'dlg->did.len'.<br>
new_did->s[dlg->did.len] = 'x';<br>
<br>
Regards,<br>
Hugh<div class="HOEnZb"><div class="h5"><br>
<br>
On 02/04/2013 18:46, Jason Penton wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Module: sip-router<br>
Branch: master<br>
Commit: 9e7f627c5e9a4c34193e4662fbe341<u></u>b70fa308bf<br>
URL: <a href="http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e7f627c5e9a4c34193e4662fbe341b70fa308bf" target="_blank">http://git.sip-router.org/cgi-<u></u>bin/gitweb.cgi/sip-router/?a=<u></u>commit;h=<u></u>9e7f627c5e9a4c34193e4662fbe341<u></u>b70fa308bf</a><br>
<br>
Author: Jason Penton <<a href="mailto:jason.penton@smilecoms.com" target="_blank">jason.penton@smilecoms.com</a>><br>
Committer: Jason Penton <<a href="mailto:jason.penton@smilecoms.com" target="_blank">jason.penton@smilecoms.com</a>><br>
Date: Tue Apr 2 19:44:46 2013 +0200<br>
<br>
modules/dialog_ng: bug fix for concurrent dialog did generation<br>
- spotted by Camille @ Orange - tks!<br>
<br>
---<br>
<br>
modules/dialog_ng/dlg_hash.c | 7 ++++---<br>
1 files changed, 4 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/modules/dialog_ng/dlg_hash.c b/modules/dialog_ng/dlg_hash.c<br>
index 97e1371..51f8eec 100644<br>
--- a/modules/dialog_ng/dlg_hash.c<br>
+++ b/modules/dialog_ng/dlg_hash.c<br>
@@ -1268,12 +1268,13 @@ int dlg_set_toroute(struct dlg_cell *dlg, str * route) {<br>
*/<br>
void create_concurrent_did(struct dlg_cell *dlg, str * new_did) {<br>
int len = dlg->did.len + 1;<br>
- new_did = shm_malloc(len);<br>
- if (new_did == 0) {<br>
+ new_did->s = shm_malloc(len);<br>
+ if (new_did->s == 0) {<br>
LM_ERR("no more shm mem (%d)\n", len);<br>
+ return;<br>
}<br>
memcpy(new_did->s, dlg->did.s, dlg->did.len);<br>
- new_did->s[dlg->did.len+1]= 'x';<br>
+ new_did->s[len]= 'x';<br>
new_did->len = len;<br>
}<br>
<br>
<br>
______________________________<u></u>_________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org" target="_blank">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/<u></u>cgi-bin/mailman/listinfo/sr-<u></u>dev</a><br>
</blockquote>
<br>
<br></div></div><span class="HOEnZb"><font color="#888888">
-- <br>
Hugh Waite<br>
Principal Design Engineer<br>
Crocodile RCS Ltd.</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
______________________________<u></u>_________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org" target="_blank">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/<u></u>cgi-bin/mailman/listinfo/sr-<u></u>dev</a><br>
</div></div></blockquote></div><br></div>