Mesa (master): clover/util: Null-terminate the result of compat::string:: c_str().

Francisco Jerez currojerez at kemper.freedesktop.org
Fri Sep 5 06:30:51 UTC 2014


Module: Mesa
Branch: master
Commit: b4539274b6478249d52e99fa34243daacf48be80
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4539274b6478249d52e99fa34243daacf48be80

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Aug 18 15:25:35 2014 +0300

clover/util: Null-terminate the result of compat::string::c_str().

Reported-by: EdB <edb+mesa at sigluy.net>

---

 src/gallium/state_trackers/clover/util/compat.hpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/util/compat.hpp b/src/gallium/state_trackers/clover/util/compat.hpp
index e0ab965..7305577 100644
--- a/src/gallium/state_trackers/clover/util/compat.hpp
+++ b/src/gallium/state_trackers/clover/util/compat.hpp
@@ -361,7 +361,9 @@ namespace clover {
 
          const char *
          c_str() const {
-            return begin();
+            v.reserve(size() + 1);
+            *v.end() = 0;
+            return v.begin();
          }
 
          const char *




More information about the mesa-commit mailing list