Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: net/cert/x509_cert_types.cc

Issue 1832583002: Don't allow negative date components in ParseCertificateDate(), or ones starting with a plus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@parse_num
Patch Set: moar test Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/cert/x509_cert_types_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/x509_cert_types.h" 5 #include "net/cert/x509_cert_types.h"
6 6
7 #include <cstdlib> 7 #include <cstdlib>
8 #include <cstring> 8 #include <cstring>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
13 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "net/base/parse_number.h"
14 #include "net/cert/x509_certificate.h" 14 #include "net/cert/x509_certificate.h"
15 15
16 namespace net { 16 namespace net {
17 17
18 namespace { 18 namespace {
19 19
20 // Helper for ParseCertificateDate. |*field| must contain at least 20 // Helper for ParseCertificateDate. |*field| must contain at least
21 // |field_len| characters. |*field| will be advanced by |field_len| on exit. 21 // |field_len| characters. |*field| will be advanced by |field_len| on exit.
22 // |*ok| is set to false if there is an error in parsing the number, but left 22 // |*ok| is set to false if there is an error in parsing the number, but left
23 // untouched otherwise. Returns the parsed integer. 23 // untouched otherwise. Returns the parsed integer.
24 int ParseIntAndAdvance(const char** field, size_t field_len, bool* ok) { 24 int ParseIntAndAdvance(const char** field, size_t field_len, bool* ok) {
25 int result = 0; 25 int result = 0;
26 *ok &= base::StringToInt(base::StringPiece(*field, field_len), &result); 26 *ok &=
27 ParseNonNegativeDecimalInt(base::StringPiece(*field, field_len), &result);
27 *field += field_len; 28 *field += field_len;
28 return result; 29 return result;
29 } 30 }
30 31
31 } 32 }
32 33
33 CertPrincipal::CertPrincipal() { 34 CertPrincipal::CertPrincipal() {
34 } 35 }
35 36
36 CertPrincipal::CertPrincipal(const std::string& name) : common_name(name) {} 37 CertPrincipal::CertPrincipal(const std::string& name) : common_name(name) {}
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 valid &= exploded.HasValidValues(); 74 valid &= exploded.HasValidValues();
74 75
75 if (!valid) 76 if (!valid)
76 return false; 77 return false;
77 78
78 *time = base::Time::FromUTCExploded(exploded); 79 *time = base::Time::FromUTCExploded(exploded);
79 return true; 80 return true;
80 } 81 }
81 82
82 } // namespace net 83 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/cert/x509_cert_types_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698