diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2018-04-25 06:39:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 06:39:02 -0700 |
| commit | 42ec780a6f6eedef4d8b1d8218bd72fc6ed75cc0 (patch) | |
| tree | 7bf86c4d92d6a0f77eced79bfc33313c62c7b6dd /ext/miniupnpc/minixml.c | |
| parent | 18c9dc8a0649c866eff9f299f20fa5b19c502e52 (diff) | |
| parent | 4608880fb06700822d01e9e5d6729fcdeb82b64b (diff) | |
| download | infinitytier-42ec780a6f6eedef4d8b1d8218bd72fc6ed75cc0.tar.gz infinitytier-42ec780a6f6eedef4d8b1d8218bd72fc6ed75cc0.zip | |
Merge branch 'dev' into netbsd-support
Diffstat (limited to 'ext/miniupnpc/minixml.c')
| -rw-r--r-- | ext/miniupnpc/minixml.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/miniupnpc/minixml.c b/ext/miniupnpc/minixml.c index 5c79b3c9..935ec443 100644 --- a/ext/miniupnpc/minixml.c +++ b/ext/miniupnpc/minixml.c @@ -1,11 +1,11 @@ -#define _CRT_SECURE_NO_WARNINGS -/* $Id: minixml.c,v 1.11 2014/02/03 15:54:12 nanard Exp $ */ -/* minixml.c : the minimum size a xml parser can be ! */ +/* $Id: minixml.c,v 1.12 2017/12/12 11:17:40 nanard Exp $ */ +/* vim: tabstop=4 shiftwidth=4 noexpandtab + * minixml.c : the minimum size a xml parser can be ! */ /* Project : miniupnp * webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * Author : Thomas Bernard -Copyright (c) 2005-2014, Thomas BERNARD +Copyright (c) 2005-2017, Thomas BERNARD All rights reserved. Redistribution and use in source and binary forms, with or without @@ -162,7 +162,8 @@ static void parseelt(struct xmlparser * p) if (p->xml >= p->xmlend) return; } - if(memcmp(p->xml, "<![CDATA[", 9) == 0) + /* CDATA are at least 9 + 3 characters long : <![CDATA[ ]]> */ + if((p->xmlend >= (p->xml + (9 + 3))) && (memcmp(p->xml, "<![CDATA[", 9) == 0)) { /* CDATA handling */ p->xml += 9; |