Fix #94

Author: cowtowncoder

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufGenerator.java

@@ -1289,6 +1289,9 @@ protected void _encodeLongerString(String text) throws IOException
 
     protected void _writeLengthPrefixed(byte[] data, int offset, int len) throws IOException
     {
+        // 15-Jun-2017, tatu: [dataformats-binary#94]: need to ensure there is actually
+        //    enough space for simple add; if not, need more checking
+        _ensureRoom(10); // max tag 5 bytes, ditto max length
         int ptr = _writeTag(_currPtr);
         ptr = ProtobufUtil.appendLengthLength(len, _currBuffer, ptr);
 
@@ -1783,7 +1786,7 @@ protected final void _ensureRoom(int needed) throws IOException
 
     protected final void _ensureMore() throws IOException
     {
-    // if not, either simple (flush), or 
+        // if not, either simple (flush), or 
         final int start = _currStart;
         final int currLen = _currPtr - start;
 

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/failing/WriteLongString94Test.java

@@ -31,7 +31,7 @@ public void testLongerStrings() throws Exception {
         ProtobufSchema schema = MAPPER.generateSchemaFor(p.getClass());
         byte[] proto = MAPPER.writer(schema)
                 .writeValueAsBytes(p);
-        assertEquals(13, proto.length);
+        assertEquals(2 * (7995 + 3), proto.length);
 
         TwoStrings result = MAPPER.readerFor(p.getClass())
                 .with(schema)

release-notes/CREDITS

@@ -20,3 +20,10 @@ Kenji Noguchi (knoguchi@github)
 
 * Reported #70 (protobuf), contributed fix: Can't deserialize packed repeated field
  (2.8.9)
+
+marsqing@github
+
+* Reported #85: (protobuf) _decode32Bits() bug in ProtobufParser
+ (2.8.9)
+* Reported #94: (protobuf) Should _ensureRoom in ProtobufGenerator.writeString()
+ (2.8.10)

release-notes/VERSION

@@ -11,6 +11,11 @@ Modules:
 
 2.9.0 (not yet released)
 
+2.8.9.1 (not yet released)
+
+#94: Should _ensureRoom in ProtobufGenerator.writeString()
+ (reported by marsqing@github)
+
 2.8.9 (12-Jun-2017)
 
 #72: (protobuf) parser fails with /* comment */