diff options
| author | elupus <elupus@svn> | 2010-10-19 22:56:07 +0000 |
|---|---|---|
| committer | elupus <elupus@svn> | 2010-10-19 22:56:07 +0000 |
| commit | 887728b93d0a8cddd6a08bfddc4079f4c2ae82f8 (patch) | |
| tree | f69fb6f822460c6a55a44a24b878a126c4a32968 | |
| parent | 95df1d019cb7ea64a6f748a9104db1ecd666af42 (diff) | |
fixed: some more invalid format specifiers for sscanf
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@34867 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | xbmc/DNSNameCache.cpp | 2 | ||||
| -rw-r--r-- | xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp | 2 | ||||
| -rw-r--r-- | xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp | 4 | ||||
| -rw-r--r-- | xbmc/lib/libshout/http.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/xbmc/DNSNameCache.cpp b/xbmc/DNSNameCache.cpp index 0b9be75509..a99ab71c47 100644 --- a/xbmc/DNSNameCache.cpp +++ b/xbmc/DNSNameCache.cpp @@ -59,7 +59,7 @@ bool CDNSNameCache::Lookup(const CStdString& strHostName, CStdString& strIpAddre { while (fgets(line, sizeof line, fp)) { - if (sscanf(line, "%s *<00>\n", nmb_ip)) + if (sscanf(line, "%99s *<00>\n", nmb_ip)) { if (inet_addr(nmb_ip) != INADDR_NONE) strIpAddress = nmb_ip; diff --git a/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp b/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp index e66de1a188..2e744081d9 100644 --- a/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp +++ b/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp @@ -781,7 +781,7 @@ PLT_CtrlPoint::ProcessSsdpSearchResponse(NPT_Result res, char tmp_st[200]; int ret; // FIXME: We can't use sscanf directly! - ret = sscanf(((const char*)*usn)+5, "%[^::]::%s", + ret = sscanf(((const char*)*usn)+5, "%199[^::]::%199s", tmp_uuid, tmp_st); if (ret != 2) diff --git a/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp b/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp index 58990ebff5..68cdb8cb53 100644 --- a/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp +++ b/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp @@ -343,7 +343,7 @@ PLT_HttpHelper::GetRange(NPT_HttpRequest& request, char s[32], e[32]; s[0] = '\0'; e[0] = '\0'; - int ret = sscanf(*range, "bytes=%[^-]-%s", s, e); + int ret = sscanf(*range, "bytes=%31[^-]-%31s", s, e); if (ret < 1) { return NPT_FAILURE; } @@ -421,7 +421,7 @@ PLT_HttpHelper::GetContentRange(NPT_HttpResponse& response, s[0] = '\0'; e[0] = '\0'; l[0] = '\0'; - int ret = sscanf(*range, "bytes %[^-]-%s[^/]/%s", s, e, l); + int ret = sscanf(*range, "bytes %31[^-]-%31s[^/]/%31s", s, e, l); if (ret < 3) { return NPT_FAILURE; } diff --git a/xbmc/lib/libshout/http.c b/xbmc/lib/libshout/http.c index daceb8a306..c8d55e6d03 100644 --- a/xbmc/lib/libshout/http.c +++ b/xbmc/lib/libshout/http.c @@ -115,7 +115,7 @@ httplib_parse_url(const char *url, URLINFO *urlinfo) /* search for a login '@' token */ if (strchr(url, '@') != NULL) { - ret = sscanf(url, "%[^:]:%[^@]", urlinfo->username, urlinfo->password); + ret = sscanf(url, "%1023[^:]:%1023[^@]", urlinfo->username, urlinfo->password); #if defined (commentout) if (ret < 2) return SR_ERROR_PARSE_FAILURE; #endif @@ -132,13 +132,13 @@ httplib_parse_url(const char *url, URLINFO *urlinfo) /* search for a port seperator */ if (strchr(url, ':') != NULL) { - ret = sscanf(url, "%[^:]:%hu/%s", urlinfo->host, + ret = sscanf(url, "%511[^:]:%hu/%252s", urlinfo->host, (short unsigned int*)&urlinfo->port, urlinfo->path+1); if (urlinfo->port < 1) return SR_ERROR_PARSE_FAILURE; ret -= 1; } else { urlinfo->port = 80; - ret = sscanf(url, "%[^/]/%s", urlinfo->host, urlinfo->path+1); + ret = sscanf(url, "%511[^/]/%252s", urlinfo->host, urlinfo->path+1); } if (ret < 1) return SR_ERROR_INVALID_URL; |