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

Side by Side Diff: third_party/WebKit/Source/core/xml/parser/SharedBufferReader.h

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 // Allows transfer of data in multiple chunks from a SharedBuffer to a provided buffer. 43 // Allows transfer of data in multiple chunks from a SharedBuffer to a provided buffer.
44 class CORE_EXPORT SharedBufferReader { 44 class CORE_EXPORT SharedBufferReader {
45 USING_FAST_MALLOC(SharedBufferReader); 45 USING_FAST_MALLOC(SharedBufferReader);
46 public: 46 public:
47 SharedBufferReader(PassRefPtr<SharedBuffer>); 47 SharedBufferReader(PassRefPtr<SharedBuffer>);
48 48
49 ~SharedBufferReader(); 49 ~SharedBufferReader();
50 50
51 // Returns the number of bytes that were read (i.e. written to |outputBuffer |). 51 // Returns the number of bytes that were read (i.e. written to |outputBuffer |).
52 int readData(char* outputBuffer, unsigned askedToRead); 52 // TODO(junov): use size_t instead of int. Until then, readData uses safeCas t internally.
53 int readData(char* outputBuffer, int askedToRead);
53 54
54 private: 55 private:
55 RefPtr<SharedBuffer> m_buffer; 56 RefPtr<SharedBuffer> m_buffer;
56 unsigned m_currentOffset; 57 size_t m_currentOffset;
57 }; 58 };
58 59
59 } // namespace blink 60 } // namespace blink
60 61
61 #endif // SharedBufferReader_h 62 #endif // SharedBufferReader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698