Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: compiled/filter/ActiveFilter.cpp

Issue 29404594: Noissue - [emscripten] Replace sprintf() usage by safe alternatives (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore
Left Patch Set: Created April 6, 2017, 8:40 a.m.
Right Patch Set: Implemented a simple number conversion method Created April 6, 2017, 3:12 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « compiled/bindings.ipp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <cstdio> 18 #include <cstdio>
19 19
20 #include "ActiveFilter.h" 20 #include "ActiveFilter.h"
21 #include "../StringScanner.h" 21 #include "../StringScanner.h"
22 22
23 namespace 23 namespace
24 { 24 {
25 const DependentString DEFAULT_DOMAIN(u""_str); 25 const DependentString DEFAULT_DOMAIN(u""_str);
26
27 OwnedString to_string(unsigned int i)
28 {
29 const std::size_t BUFFER_SIZE = 11;
30 char buffer[BUFFER_SIZE];
31 int len = snprintf(buffer, BUFFER_SIZE, "%u", i);
32
33 OwnedString result(len);
hub 2017/04/06 10:31:23 From `man snprintf`
Wladimir Palant 2017/04/06 15:14:40 We have the same issue in the subscription classes
34 for (String::size_type i = 0; i < len; i++)
35 result[i] = buffer[i];
36 return result;
37 }
38 } 26 }
39 27
40 ActiveFilter::ActiveFilter(Type type, const String& text, bool ignoreTrailingDot ) 28 ActiveFilter::ActiveFilter(Type type, const String& text, bool ignoreTrailingDot )
41 : Filter(type, text), mDisabled(false), mHitCount(0), mLastHit(0), 29 : Filter(type, text), mDisabled(false), mHitCount(0), mLastHit(0),
42 mIgnoreTrailingDot(ignoreTrailingDot) 30 mIgnoreTrailingDot(ignoreTrailingDot)
43 { 31 {
44 } 32 }
45 33
46 ActiveFilter::DomainMap* ActiveFilter::GetDomains() const 34 ActiveFilter::DomainMap* ActiveFilter::GetDomains() const
47 { 35 {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 176
189 OwnedString ActiveFilter::Serialize() const 177 OwnedString ActiveFilter::Serialize() const
190 { 178 {
191 /* TODO this is very inefficient */ 179 /* TODO this is very inefficient */
192 OwnedString result(Filter::Serialize()); 180 OwnedString result(Filter::Serialize());
193 if (mDisabled) 181 if (mDisabled)
194 result.append(u"disabled=true\n"_str); 182 result.append(u"disabled=true\n"_str);
195 if (mHitCount) 183 if (mHitCount)
196 { 184 {
197 result.append(u"hitCount="_str); 185 result.append(u"hitCount="_str);
198 result.append(to_string(mHitCount)); 186 result.append(mHitCount);
199 result.append(u'\n'); 187 result.append(u'\n');
200 } 188 }
201 if (mLastHit) 189 if (mLastHit)
202 { 190 {
203 result.append(u"lastHit="_str); 191 result.append(u"lastHit="_str);
204 result.append(to_string(mLastHit)); 192 result.append(mLastHit);
205 result.append(u'\n'); 193 result.append(u'\n');
206 } 194 }
207 return result; 195 return result;
208 } 196 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld