Changeset 24096 in webkit
- Timestamp:
- Jul 8, 2007 4:49:45 AM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r24095 r24096 1 2007-07-08 Darin Adler <darin@apple.com> 2 3 Reviewed by Maciej. 4 5 - fix <rdar://problem/5318994> Integer overflow in WebCore's Base64.cpp:base64Encode 6 7 * platform/Base64.cpp: 8 (WebCore::base64Encode): Check against a maximum size. 9 (WebCore::base64Decode): Ditto. 10 1 11 2007-07-08 Darin Adler <darin@apple.com> 2 12 -
trunk/WebCore/platform/Base64.cpp
r18186 r24096 2 2 Copyright (C) 2000-2001 Dawit Alemayehu <adawit@kde.org> 3 3 Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org> 4 Copyright (C) 2007 Apple Inc. All rights reserved. 4 5 5 6 This program is free software; you can redistribute it and/or modify … … 28 29 namespace WebCore { 29 30 30 static const char base64EncMap[64] = 31 { 32 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 33 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 34 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 35 0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 36 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 37 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 38 0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33, 39 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F 31 static const char base64EncMap[64] = { 32 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 33 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 34 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 35 0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 36 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 37 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 38 0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33, 39 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F 40 40 }; 41 41 42 static const char base64DecMap[128] = 43 { 44 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 45 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 46 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 47 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 48 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 49 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x3F, 50 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 51 0x3C, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 52 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 53 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 54 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 55 0x17, 0x18, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 56 0x00, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 57 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 58 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 59 0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00 42 static const char base64DecMap[128] = { 43 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 44 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 45 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 46 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 47 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 48 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x3F, 49 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 50 0x3C, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 51 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 52 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 53 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 54 0x17, 0x18, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 55 0x00, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 56 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 57 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 58 0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00 60 59 }; 61 60 62 61 void base64Encode(const Vector<char>& in, Vector<char>& out, bool insertLFs) 63 62 { 64 // clear out the output buffer65 63 out.clear(); 66 64 if (in.isEmpty()) 65 return; 66 67 // If the input string is pathologically large, just return nothing. 68 // Note: Keep this in sync with the "out_len" computation below. 69 // Rather than being perfectly precise, this is a bit conservative. 70 const unsigned maxInputBufferSize = UINT_MAX / 77 * 76 / 4 * 3 - 2; 71 if (in.size() > maxInputBufferSize) 67 72 return; 68 73 … … 74 79 unsigned out_len = ((len + 2) / 3) * 4; 75 80 76 // Deal with the 76 characters or less per 77 // line limit specified in RFC 2045 on a 78 // pre request basis. 81 // Deal with the 76 character per line limit specified in RFC 2045. 79 82 insertLFs = (insertLFs && out_len > 76); 80 83 if (insertLFs) … … 125 128 return true; 126 129 130 // If the input string is pathologically large, just return nothing. 131 if (in.size() > UINT_MAX) 132 return false; 133 127 134 unsigned len = in.size(); 128 135 const char* data = in.data();
Note: See TracChangeset
for help on using the changeset viewer.