github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'aria2:master' into master

pull/2174/head
longtrip1 2022-12-19 00:34:54 -08:00 committed by GitHub
parent 96757301e6 f4cbc7bb31
commit 4ae8183165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GZipEncoder.cc
View File

@ -87,7 +87,7 @@ std::string GZipEncoder::encode(const unsigned char* in, size_t length,
throw DL_ABORT_EX(fmt("libz::deflate() failed. cause:%s", strm_->msg)); throw DL_ABORT_EX(fmt("libz::deflate() failed. cause:%s", strm_->msg));
} }
size_t produced = outbuf.size() - strm_->avail_out; size_t produced = outbuf.size() - strm_->avail_out;
out.append(&outbuf[0], &outbuf[produced]); out.append(outbuf.data(), outbuf.data() + produced);
if (strm_->avail_out > 0) { if (strm_->avail_out > 0) {
break; break;
} }

8
src/MetalinkParserStateV4Impl.cc
View File

@ -47,7 +47,7 @@ namespace aria2 {
const char METALINK4_NAMESPACE_URI[] = "urn:ietf:params:xml:ns:metalink"; const char METALINK4_NAMESPACE_URI[] = "urn:ietf:params:xml:ns:metalink";
namespace { namespace {
bool checkNsUri(const char* nsUri) bool isMetalink4Ns(const char* nsUri)
{ {
return nsUri && strcmp(nsUri, METALINK4_NAMESPACE_URI) == 0; return nsUri && strcmp(nsUri, METALINK4_NAMESPACE_URI) == 0;
} }
@ -57,7 +57,7 @@ void MetalinkMetalinkParserStateV4::beginElement(
MetalinkParserStateMachine* psm, const char* localname, const char* prefix, MetalinkParserStateMachine* psm, const char* localname, const char* prefix,
const char* nsUri, const std::vector<XmlAttr>& attrs) const char* nsUri, const std::vector<XmlAttr>& attrs)
{ {
if (checkNsUri(nsUri) && strcmp(localname, "file") != 0) { if (!isMetalink4Ns(nsUri) || strcmp(localname, "file") != 0) {
psm->setSkipTagState(); psm->setSkipTagState();
return; return;
} }
@ -83,7 +83,7 @@ void FileMetalinkParserStateV4::beginElement(MetalinkParserStateMachine* psm,
const char* nsUri, const char* nsUri,
const std::vector<XmlAttr>& attrs) const std::vector<XmlAttr>& attrs)
{ {
if (!checkNsUri(nsUri)) { if (!isMetalink4Ns(nsUri)) {
psm->setSkipTagState(); psm->setSkipTagState();
} }
else if (strcmp(localname, "size") == 0) { else if (strcmp(localname, "size") == 0) {
@ -293,7 +293,7 @@ void PiecesMetalinkParserStateV4::beginElement(
MetalinkParserStateMachine* psm, const char* localname, const char* prefix, MetalinkParserStateMachine* psm, const char* localname, const char* prefix,
const char* nsUri, const std::vector<XmlAttr>& attrs) const char* nsUri, const std::vector<XmlAttr>& attrs)
{ {
if (checkNsUri(nsUri) && strcmp(localname, "hash") == 0) { if (isMetalink4Ns(nsUri) && strcmp(localname, "hash") == 0) {
psm->setPieceHashStateV4(); psm->setPieceHashStateV4();
} }
else { else {

2
src/WinTLSSession.h
View File

@ -37,7 +37,7 @@
#define WIN_TLS_SESSION_H #define WIN_TLS_SESSION_H
#include <vector> #include <vector>
#include <array>
#include "common.h" #include "common.h"
#include "TLSSession.h" #include "TLSSession.h"
#include "WinTLSContext.h" #include "WinTLSContext.h"