summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-01 16:12:48 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-01 16:12:48 -0700
commit0b36bb48bd2e8c0a24505521e267cdd52a1dd683 (patch)
tree167ca97ac7598b2cc4d92b30f9ecc2ac1979470c /core/include
parent7f840ae069b677360a7f96a7abd5e2903d302bdd (diff)
downloadpdfium-0b36bb48bd2e8c0a24505521e267cdd52a1dd683.tar.xz
Merge to XFA: CFX_ByteString/WideString header changes
Original Review URL: https://codereview.chromium.org/1117413002 Original Review URL: https://codereview.chromium.org/1118983003 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1125493002
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxcrt/fx_string.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index a7cf2e1c16..c98a77cfe1 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -7,6 +7,7 @@
#ifndef _FX_STRING_H_
#define _FX_STRING_H_
+#include <stdint.h> // For intptr_t.
#include <algorithm>
#include "fx_memory.h"
@@ -168,14 +169,17 @@ private:
typedef const CFX_ByteStringC& FX_BSTR;
#define FX_BSTRC(str) CFX_ByteStringC(str, sizeof str-1)
#define FXBSTR_ID(c1, c2, c3, c4) ((c1 << 24) | (c2 << 16) | (c3 << 8) | (c4))
-struct CFX_StringData {
-
- long m_nRefs;
+// To ensure ref counts do not overflow, consider the worst possible case:
+// the entire address space contains nothing but pointers to this object.
+// Since the count increments with each new pointer, the largest value is
+// the number of pointers that can fit into the address space. The size of
+// the address space itself is a good upper bound on it; we need not go
+// larger.
+struct CFX_StringData {
+ intptr_t m_nRefs; // Would prefer ssize_t, but no windows support.
FX_STRSIZE m_nDataLength;
-
FX_STRSIZE m_nAllocLength;
-
FX_CHAR m_String[1];
};
class CFX_ByteString
@@ -586,13 +590,9 @@ private:
typedef const CFX_WideStringC& FX_WSTR;
#define FX_WSTRC(wstr) CFX_WideStringC(wstr, FX_ArraySize(wstr) - 1)
struct CFX_StringDataW {
-
- long m_nRefs;
-
+ intptr_t m_nRefs; // Would prefer ssize_t, but no windows support.
FX_STRSIZE m_nDataLength;
-
FX_STRSIZE m_nAllocLength;
-
FX_WCHAR m_String[1];
};
class CFX_WideString