sprintf() => snprintf()
This commit is contained in:
parent
b2e47dfde4
commit
751d503f54
@ -55,6 +55,7 @@
|
|||||||
#include "urldata.h"
|
#include "urldata.h"
|
||||||
#include "sendf.h"
|
#include "sendf.h"
|
||||||
|
|
||||||
|
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
|
||||||
#include <curl/mprintf.h>
|
#include <curl/mprintf.h>
|
||||||
|
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
@ -87,7 +88,7 @@ void failf(struct UrlData *data, char *fmt, ...)
|
|||||||
va_list ap;
|
va_list ap;
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
if(data->errorbuffer)
|
if(data->errorbuffer)
|
||||||
vsprintf(data->errorbuffer, fmt, ap);
|
vsnprintf(data->errorbuffer, CURL_ERROR_SIZE, fmt, ap);
|
||||||
else /* no errorbuffer receives this, write to data->err instead */
|
else /* no errorbuffer receives this, write to data->err instead */
|
||||||
vfprintf(data->err, fmt, ap);
|
vfprintf(data->err, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
@ -917,7 +917,7 @@ CURLcode curl_connect(CURL *curl, CURLconnect **in_connect)
|
|||||||
if(data->resume_from) {
|
if(data->resume_from) {
|
||||||
if(!data->bits.set_range) {
|
if(!data->bits.set_range) {
|
||||||
/* if it already was in use, we just skip this */
|
/* if it already was in use, we just skip this */
|
||||||
sprintf(resumerange, "%d-", data->resume_from);
|
snprintf(resumerange, sizeof(resumerange), "%d-", data->resume_from);
|
||||||
data->range=strdup(resumerange); /* tell ourselves to fetch this range */
|
data->range=strdup(resumerange); /* tell ourselves to fetch this range */
|
||||||
data->bits.rangestringalloc = TRUE; /* mark as allocated */
|
data->bits.rangestringalloc = TRUE; /* mark as allocated */
|
||||||
data->bits.set_range = 1; /* switch on range usage */
|
data->bits.set_range = 1; /* switch on range usage */
|
||||||
@ -1415,7 +1415,8 @@ CURLcode curl_connect(CURL *curl, CURLconnect **in_connect)
|
|||||||
|
|
||||||
if(data->bits.proxy_user_passwd) {
|
if(data->bits.proxy_user_passwd) {
|
||||||
char *authorization;
|
char *authorization;
|
||||||
sprintf(data->buffer, "%s:%s", data->proxyuser, data->proxypasswd);
|
snprintf(data->buffer, BUFSIZE, "%s:%s",
|
||||||
|
data->proxyuser, data->proxypasswd);
|
||||||
if(base64_encode(data->buffer, strlen(data->buffer),
|
if(base64_encode(data->buffer, strlen(data->buffer),
|
||||||
&authorization) >= 0) {
|
&authorization) >= 0) {
|
||||||
data->ptr_proxyuserpwd =
|
data->ptr_proxyuserpwd =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user