mirror of
https://github.com/nodejs/node.git
synced 2026-11-09 15:11:11 -05:00
Merge remote-tracking branch ry/v0.10 into master
Conflicts: AUTHORS ChangeLog src/node_crypto.cc src/node_version.h
This commit is contained in:
commit
0fefcc1690
8 files changed
+116
-24
No files matched your search
+8
-10
@@ -63,16 +63,15 @@ static inline size_t base64_decoded_size_fast(size_t size) {
|
||||
}
|
||||
|
||||
static inline size_t base64_decoded_size(const char* src, size_t size) {
|
||||
size = base64_decoded_size_fast(size);
|
||||
if (size == 0)
|
||||
return 0;
|
||||
|
||||
const char* end = src + size;
|
||||
// check for trailing padding (1 or 2 bytes)
|
||||
if (size > 0) {
|
||||
if (end[-1] == '=') size--;
|
||||
if (size > 0 && end[-2] == '=') size--;
|
||||
}
|
||||
if (src[size - 1] == '=')
|
||||
size--;
|
||||
if (size > 0 && src[size - 1] == '=')
|
||||
size--;
|
||||
|
||||
return size;
|
||||
return base64_decoded_size_fast(size);
|
||||
}
|
||||
|
||||
|
||||
@@ -551,8 +550,7 @@ Local<Value> StringBytes::Encode(const char* buf,
|
||||
Local<String> val;
|
||||
switch (encoding) {
|
||||
case BUFFER:
|
||||
return scope.Close(
|
||||
Buffer::New(static_cast<const char*>(buf), buflen)->handle_);
|
||||
return scope.Close(Buffer::New(buf, buflen)->handle_);
|
||||
|
||||
case ASCII:
|
||||
if (contains_non_ascii(buf, buflen)) {
|
||||
|
||||
Reference in new issue
Block a user