Imported Upstream version 1.57.0upstream/1.57.0

5 files changed, 14 insertions, 6 deletions

diff --git a/boost/locale/date_time.hpp b/boost/locale/date_time.hpp
index 4a50198aa9..71a92690a1 100644
--- a/boost/locale/date_time.hpp
+++ b/boost/locale/date_time.hpp
@@ -104,7 +104,7 @@ namespace boost {
             ///
             ///  Get period_type for: Day of week, Sunday=1, Monday=2,..., Saturday=7.
             ///
-            /// Note that that updating this value respects local day of week, so for example,
+            /// Note that updating this value respects local day of week, so for example,
             /// If first day of week is Monday and the current day is Tuesday then setting
             /// the value to Sunday (1) would forward the date by 5 days forward and not backward
             /// by two days as it could be expected if the numbers were taken as is.
@@ -179,7 +179,7 @@ namespace boost {
             ///
             ///  Get date_time_period for: Day of week, Sunday=1, Monday=2,..., Saturday=7.
             ///
-            /// Note that that updating this value respects local day of week, so for example,
+            /// Note that updating this value respects local day of week, so for example,
             /// If first day of week is Monday and the current day is Tuesday then setting
             /// the value to Sunday (1) would forward the date by 5 days forward and not backward
             /// by two days as it could be expected if the numbers were taken as is.
@@ -1009,7 +1009,7 @@ namespace boost {
             ///
             ///  Extract from date_time numerical value of Day of week, Sunday=1, Monday=2,..., Saturday=7.
             ///
-            /// Note that that updating this value respects local day of week, so for example,
+            /// Note that updating this value respects local day of week, so for example,
             /// If first day of week is Monday and the current day is Tuesday then setting
             /// the value to Sunday (1) would forward the date by 5 days forward and not backward
             /// by two days as it could be expected if the numbers were taken as is.
diff --git a/boost/locale/date_time_facet.hpp b/boost/locale/date_time_facet.hpp
index b4859ccb75..6ccca9bddc 100644
--- a/boost/locale/date_time_facet.hpp
+++ b/boost/locale/date_time_facet.hpp
@@ -37,7 +37,7 @@ namespace boost {
                     day,                        ///< The day of month, calendar specific, in Gregorian [1..31]
                     day_of_year,                ///< The number of day in year, starting from 1, in Gregorian  [1..366]
                     day_of_week,                ///< Day of week, Sunday=1, Monday=2,..., Saturday=7.
-                                                ///< Note that that updating this value respects local day of week, so for example,
+                                                ///< Note that updating this value respects local day of week, so for example,
                                                 ///< If first day of week is Monday and the current day is Tuesday then setting
                                                 ///< the value to Sunday (1) would forward the date by 5 days forward and not backward
                                                 ///< by two days as it could be expected if the numbers were taken as is.
diff --git a/boost/locale/encoding.hpp b/boost/locale/encoding.hpp
index aa1c1ef81d..24742bf053 100644
--- a/boost/locale/encoding.hpp
+++ b/boost/locale/encoding.hpp
@@ -229,6 +229,8 @@ namespace boost {
             #endif
 
 
+            /// \endcond
+
             /// @}
 
         } // conv
diff --git a/boost/locale/utf.hpp b/boost/locale/utf.hpp
index f156692ffc..09f4449ef9 100644
--- a/boost/locale/utf.hpp
+++ b/boost/locale/utf.hpp
@@ -29,7 +29,7 @@ namespace utf {
     /// \endcond
 
     ///
-    /// \brief The integral type type that can hold a Unicode code point
+    /// \brief The integral type that can hold a Unicode code point
     ///
     typedef uint32_t code_point;
 
@@ -219,16 +219,22 @@ namespace utf {
                 if(BOOST_LOCALE_UNLIKELY(p==e))
                     return incomplete;
                 tmp = *p++;
+                if (!is_trail(tmp))
+                    return illegal;
                 c = (c << 6) | ( tmp & 0x3F);
             case 2:
                 if(BOOST_LOCALE_UNLIKELY(p==e))
                     return incomplete;
                 tmp = *p++;
+                if (!is_trail(tmp))
+                    return illegal;
                 c = (c << 6) | ( tmp & 0x3F);
             case 1:
                 if(BOOST_LOCALE_UNLIKELY(p==e))
                     return incomplete;
                 tmp = *p++;
+                if (!is_trail(tmp))
+                    return illegal;
                 c = (c << 6) | ( tmp & 0x3F);
             }
 
diff --git a/boost/locale/util.hpp b/boost/locale/util.hpp
index 4ee46433a5..4d8206b528 100644
--- a/boost/locale/util.hpp
+++ b/boost/locale/util.hpp
@@ -133,7 +133,7 @@ namespace util {
         /// and [\a begin, \a code_point_end) would be valid input sequence, then \a incomplete is returned begin stays unchanged, for example
         /// for UTF-8 conversion a *begin = 0xc2, \a begin +1 = \a end is such situation.
         ///
-        /// if invalid input sequence found, i.e. there there is a sequence [\a begin, \a code_point_end) such as \a code_point_end <= \a end
+        /// if invalid input sequence found, i.e. there is a sequence [\a begin, \a code_point_end) such as \a code_point_end <= \a end
         /// that is illegal for this encoding, \a illegal is returned and begin stays unchanged. For example if *begin = 0xFF and begin < end
         /// for UTF-8, then \a illegal is returned.
         ///