Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/stdcxx/patches/090-7088072-string.cc.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 13 Jul 2015 10:52:10 -0700
changeset 4638 0be76b6a106a
parent 539 9db7f022d292
permissions -rw-r--r--
Close of build 79.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
539
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Patch for CR 7088072 and 7088065
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
--- stdcxx-4.2.1/include/string.cc	2011-07-10 13:09:53.630466602 -0700
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
+++ stdcxx-4.2.1/include/string.cc	2011-09-10 13:20:30.199451960 -0700
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
@@ -415,6 +415,12 @@
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
                                    "size_type, size_type, value_type)"),
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
                       __size0 - __xlen, max_size () - __count));
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+    _RWSTD_REQUIRES (__count < (max_size () - __pos),
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+                     (_RWSTD_ERROR_LENGTH_ERROR,
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+                      _RWSTD_FUNC ("basic_string::replace (size_type, "
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+                                   "size_type, size_type, value_type)"),
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+                      __count, (max_size () - __pos)));
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
     // compute the resulting string size
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
     const size_type __size1 = __size0 - __xlen + __count;
9db7f022d292 7088065 CCVS test fail: no exception thrown for out-of-range string access
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
upstream/oracle/userland-gate