Merge pull request #57 from smartdevicelink/release/1.2.5

Release 1.2.5

BiSON.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 
   s.name         = "BiSON"
-  s.version      = "1.2.3"
+  s.version      = "1.2.5"
   s.summary      = "A portable BSON C library"
 
 

BsonJavaPort/bson_java_port/build.gradle

@@ -6,7 +6,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 26
         versionCode 2
-        versionName "1.2.4"
+        versionName "1.2.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk{
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"

BsonJavaPort/bson_java_port/gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.smartdevicelink
 POM_ARTIFACT_ID=bson_java_port
-VERSION_NAME=1.2.4
+VERSION_NAME=1.2.5
 
 POM_NAME=bson_java_port
 POM_PACKAGING=aar

README.md

@@ -66,7 +66,7 @@ There is a jCenter artifact for Android. Add the following to your `build.gradle
 
 ```
 dependencies {
-    compile ('com.smartdevicelink:bson_java_port:1.2.2')
+    api 'com.smartdevicelink:bson_java_port:1.2.5'
 }
 ```
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bson_c_lib 1.2.4.
+# Generated by GNU Autoconf 2.69 for bson_c_lib 1.2.5.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bson_c_lib'
 PACKAGE_TARNAME='bson_c_lib'
-PACKAGE_VERSION='1.2.4'
-PACKAGE_STRING='bson_c_lib 1.2.4'
+PACKAGE_VERSION='1.2.5'
+PACKAGE_STRING='bson_c_lib 1.2.5'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bson_c_lib 1.2.4 to adapt to many kinds of systems.
+\`configure' configures bson_c_lib 1.2.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bson_c_lib 1.2.4:";;
+     short | recursive ) echo "Configuration of bson_c_lib 1.2.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1553,7 +1553,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bson_c_lib configure 1.2.4
+bson_c_lib configure 1.2.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2106,7 +2106,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bson_c_lib $as_me 1.2.4, which was
+It was created by bson_c_lib $as_me 1.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2969,7 +2969,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='bson_c_lib'
- VERSION='1.2.4'
+ VERSION='1.2.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12749,7 +12749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bson_c_lib $as_me 1.2.4, which was
+This file was extended by bson_c_lib $as_me 1.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12815,7 +12815,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bson_c_lib config.status 1.2.4
+bson_c_lib config.status 1.2.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16848,7 +16848,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bson_c_lib $as_me 1.2.4, which was
+This file was extended by bson_c_lib $as_me 1.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16914,7 +16914,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bson_c_lib config.status 1.2.4
+bson_c_lib config.status 1.2.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT(bson_c_lib, 1.2.4, [email protected])
+AC_INIT(bson_c_lib, 1.2.5, [email protected])
 AM_INIT_AUTOMAKE([subdir-objects foreign -Wall])
 AM_MAINTAINER_MODE
 AC_CONFIG_MACRO_DIRS([m4])

src/bson_array.c

@@ -288,7 +288,7 @@ size_t bson_array_from_bytes_len(BsonArray *output, const uint8_t *data, size_t
     }
   }
 
-  if (parseError) {
+  if (parseError || dataSize - remainBytes == 0) {
     bson_array_deinitialize(&array);
     return 0;
   }

src/bson_object.c

@@ -309,7 +309,7 @@ size_t bson_object_from_bytes_len(BsonObject *output, const uint8_t *data, size_
     }
   }
 
-  if (parseError) {
+  if (parseError || dataSize - remainBytes == 0) {
     bson_object_deinitialize(&obj);
     return 0;
   }