From c4327e55ac186383f909d52ddd363971a2c60562 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Fri, 25 Jan 2019 15:03:22 -0800
Subject: A few more fixes.

---
 upb/pb/decoder.h | 1 +
 upb/sink.h       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'upb')

diff --git a/upb/pb/decoder.h b/upb/pb/decoder.h
index 86e51df..709db49 100644
--- a/upb/pb/decoder.h
+++ b/upb/pb/decoder.h
@@ -117,6 +117,7 @@ void upb_pbdecoder_reset(upb_pbdecoder *d);
  * decoded data to its output sink. */
 class upb::pb::DecoderPtr {
  public:
+  DecoderPtr() : ptr_(nullptr) {}
   DecoderPtr(upb_pbdecoder* ptr) : ptr_(ptr) {}
 
   upb_pbdecoder* ptr() { return ptr_; }
diff --git a/upb/sink.h b/upb/sink.h
index e41feae..4d6d0a3 100644
--- a/upb/sink.h
+++ b/upb/sink.h
@@ -503,7 +503,7 @@ bool upb_bufsrc_putbuf(const char *buf, size_t len, upb_bytessink sink);
 
 namespace upb {
 template <class T> bool PutBuffer(const T& str, BytesSink sink) {
-  return upb_bufsrc_putbuf(str.c_str(), str.size(), sink.sink());
+  return upb_bufsrc_putbuf(str.data(), str.size(), sink.sink());
 }
 }
 
-- 
cgit v1.2.3