aboutsummaryrefslogtreecommitdiff
path: root/external/miniupnpc/igd_desc_parse.c
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-12-30 09:56:25 +0200
committerRiccardo Spagni <ric@spagni.net>2015-12-30 09:56:25 +0200
commit7da99055891baaa453d7d575985bc9824cf5f47c (patch)
tree95471106647425de916ca4595c145ef0464ea624 /external/miniupnpc/igd_desc_parse.c
parentMerge pull request #575 (diff)
downloadmonero-7da99055891baaa453d7d575985bc9824cf5f47c.tar.xz
updated miniupnpc
Diffstat (limited to 'external/miniupnpc/igd_desc_parse.c')
-rw-r--r--external/miniupnpc/igd_desc_parse.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/external/miniupnpc/igd_desc_parse.c b/external/miniupnpc/igd_desc_parse.c
index a43966232..d2999ad01 100644
--- a/external/miniupnpc/igd_desc_parse.c
+++ b/external/miniupnpc/igd_desc_parse.c
@@ -1,8 +1,8 @@
-/* $Id: igd_desc_parse.c,v 1.15 2014/07/01 13:01:17 nanard Exp $ */
+/* $Id: igd_desc_parse.c,v 1.17 2015/09/15 13:30:04 nanard Exp $ */
/* Project : miniupnp
* http://miniupnp.free.fr/
* Author : Thomas Bernard
- * Copyright (c) 2005-2014 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
* This software is subject to the conditions detailed in the
* LICENCE file provided in this distribution. */
@@ -15,11 +15,9 @@
void IGDstartelt(void * d, const char * name, int l)
{
struct IGDdatas * datas = (struct IGDdatas *)d;
- if (l >= MINIUPNPC_URL_MAXSIZE) {
- printf("Attempt to exploit miniupnpc buffer overflow\n");
- l = MINIUPNPC_URL_MAXSIZE - 1;
- }
- memcpy( datas->cureltname, name, l);
+ if(l >= MINIUPNPC_URL_MAXSIZE)
+ l = MINIUPNPC_URL_MAXSIZE-1;
+ memcpy(datas->cureltname, name, l);
datas->cureltname[l] = '\0';
datas->level++;
if( (l==7) && !memcmp(name, "service", l) ) {
@@ -92,6 +90,7 @@ void IGDdata(void * d, const char * data, int l)
}
}
+#ifdef DEBUG
void printIGD(struct IGDdatas * d)
{
printf("urlbase = '%s'\n", d->urlbase);
@@ -120,5 +119,5 @@ void printIGD(struct IGDdatas * d)
printf(" eventSubURL = '%s'\n", d->IPv6FC.eventsuburl);
printf(" SCPDURL = '%s'\n", d->IPv6FC.scpdurl);
}
-
+#endif /* DEBUG */