diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-28 09:25:57 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-28 09:25:57 +0200 |
| commit | 0c33605d981ceb78a4761e39043dc79ef9a571b2 (patch) | |
| tree | 83fa22dda53f0abccd7b9cf7376af8553c559068 /methods | |
| parent | 402c0d19a0c6668d7710b2b48561eb3059a04584 (diff) | |
| parent | 163dc55bd6891008adcdf6d683a94e890a00f8c7 (diff) | |
Merge remote-tracking branch 'mvo/bugfix/coverity' into debian/sid
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/ftp.cc | 1 | ||||
| -rw-r--r-- | methods/gpgv.cc | 1 | ||||
| -rw-r--r-- | methods/http.cc | 2 | ||||
| -rw-r--r-- | methods/rsh.cc | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index d55ac1224..979adca62 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -436,6 +436,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...) char S[400]; vsnprintf(S,sizeof(S) - 4,Fmt,args); strcat(S,"\r\n"); + va_end(args); if (Debug == true) cerr << "-> '" << QuoteString(S,"") << "'" << endl; diff --git a/methods/gpgv.cc b/methods/gpgv.cc index fe8bac6c9..ea8a26fd4 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -152,6 +152,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } } fclose(pipein); + free(buffer); int status; waitpid(pid, &status, 0); diff --git a/methods/http.cc b/methods/http.cc index 82456d78b..278ddb290 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1400,7 +1400,7 @@ bool HttpMethod::AutoDetectProxy() char buf[512]; int InFd = Pipes[0]; close(Pipes[1]); - int res = read(InFd, buf, sizeof(buf)); + int res = read(InFd, buf, sizeof(buf)-1); ExecWait(Process, "ProxyAutoDetect", true); if (res < 0) diff --git a/methods/rsh.cc b/methods/rsh.cc index fb3782314..d76dca6ef 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -218,6 +218,8 @@ bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...) // sprintf the description char S[512]; vsnprintf(S,sizeof(S) - 4,Fmt,args); + va_end(args); + if (Sync == true) strcat(S," 2> /dev/null || echo\n"); else |