cosmos 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04a97dbca71b76b18ea80142176aa1546e4f505
-  data.tar.gz: 33eff7d613a595b3680b7a10d37fce8c36beb1bb
+  metadata.gz: 347fbd93cb872161d7b92e30d62926f518dd70c8
+  data.tar.gz: 135bbd4fd436113705cd4be89618e104112ac085
 SHA512:
-  metadata.gz: 9b37d0e0e7bdaec78e12fdaf98988209b0fdda1ff0a576f937dec3e237b0d9cfe5acf7068eebbf3743debc76ef9a89c9f9768711d574bf95199da6f99f002d05
-  data.tar.gz: d4bbff05fb3fd13f8851603d6175833fec77758b8ca505fa7236730a9a2f84d4b5ee0dae1e1049a56e331bed2924c8181f31146b0fb18989564e0feaffa85d13
+  metadata.gz: fc8d30c9cda59b6f5fe8d29452ff72608aef066ce43304fd4b81b2694cda72c507dac9dcd3af451012850982ae57ba0d9e9bb4f2a368e5072b5b8a7da60cb770
+  data.tar.gz: 4c672f1f98fb0bda3da853f1b619465e8c7891796c7df99af4ebd1b6fa7db5220b63831de2c06233af3185cfc270547ad2831676b179d27e110a12e70600e6c8

data/data/crc.txt

@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x1D2090F6
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x577222AD
+"lib/cosmos/version.rb" 0x23E689C5
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D

data/ext/cosmos/ext/structure/structure.c

@@ -875,7 +875,8 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
     bit_size = RSTRING_LEN(value) * 8;
   }
 
-  if ((!check_bounds_and_buffer_size(bit_offset, bit_size, buffer_length, param_endianness, param_data_type, &lower_bound, &upper_bound)) && (given_bit_size > 0)) {
+  if ((!check_bounds_and_buffer_size(bit_offset, bit_size, buffer_length, param_endianness, param_data_type, &lower_bound, &upper_bound)) && (given_bit_size > 0))
+  {
     rb_funcall(self, id_method_raise_buffer_error, 5, symbol_write, param_buffer, param_data_type, param_bit_offset, param_bit_size);
   }
 
@@ -902,25 +903,31 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
       if (given_bit_size <= 0) {
         end_bytes = -(given_bit_size / 8);
         old_upper_bound = buffer_length - 1 - end_bytes;
+        /* Lower bound + end_bytes can never be more than 1 byte outside of the given buffer */
+        if ((lower_bound + end_bytes) > buffer_length)
+        {
+          rb_funcall(self, id_method_raise_buffer_error, 5, symbol_write, param_buffer, param_data_type, param_bit_offset, param_bit_size);
+        }
+
         if (old_upper_bound < lower_bound) {
           /* String was completely empty */
           if (end_bytes > 0) {
             /* Preserve bytes at end of buffer */
             rb_str_concat(param_buffer, rb_str_times(ZERO_STRING, INT2FIX(value_length)));
             buffer = (unsigned char*) RSTRING_PTR(param_buffer);
-            memmove((buffer + lower_bound + value_length), (buffer + lower_bound), value_length);
+            memmove((buffer + lower_bound + value_length), (buffer + lower_bound), end_bytes);
           }
         } else if (bit_size == 0) {
           /* Remove entire string */
           rb_str_update(param_buffer, lower_bound, old_upper_bound - lower_bound + 1, rb_str_new2(""));
         } else if (upper_bound < old_upper_bound) {
           /* Remove extra bytes from old string */
-          rb_str_update(param_buffer, upper_bound + 1, old_upper_bound + 1, rb_str_new2(""));
+          rb_str_update(param_buffer, upper_bound + 1, old_upper_bound - upper_bound, rb_str_new2(""));
         } else if ((upper_bound > old_upper_bound) && (end_bytes > 0)) {
           /* Preserve bytes at end of buffer */
           rb_str_concat(param_buffer, rb_str_times(ZERO_STRING, INT2FIX(upper_bound - old_upper_bound)));
           buffer = (unsigned char*) RSTRING_PTR(param_buffer);
-          memmove((buffer + upper_bound + 1), (buffer + old_upper_bound + 1), upper_bound - old_upper_bound);
+          memmove((buffer + upper_bound + 1), (buffer + old_upper_bound + 1), end_bytes);
         }
       } else {
         byte_size = bit_size / 8;

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.4.0'
+COSMOS_VERSION = '3.4.1'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '4'
-    PATCH = '0'
-    BUILD = '9a5a2f777b1122ed55b49caf2febf113a223eeaa'
+    PATCH = '1'
+    BUILD = '2ce089801e159a76caad0b207042e289c6ab3367'
   end
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/spec/packets/binary_accessor_spec.rb

@@ -787,6 +787,122 @@ module Cosmos
         end
       end
 
+      context "when negative bit size" do
+        it "writes a block to an empty buffer" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          buffer = ""
+          expect { BinaryAccessor.write(data, 0, -16, :BLOCK, buffer, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "0 byte buffer insufficient to write BLOCK at bit_offset 0 with bit_size -16")
+        end
+
+        it "handles a huge bit offset with small buffer" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          buffer = ""
+          expect { BinaryAccessor.write(data, 1024, 0, :BLOCK, buffer, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "0 byte buffer insufficient to write BLOCK at bit_offset 1024 with bit_size 0")
+        end
+
+        it "handles an edge case bit offset" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          buffer = "\x00" * 127
+          expect { BinaryAccessor.write(data, 1024, 0, :BLOCK, buffer, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "127 byte buffer insufficient to write BLOCK at bit_offset 1024 with bit_size 0")
+        end
+
+        it "writes a block to a small buffer preserving the end" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          preserve = [0xBEEF].pack("n")
+          buffer = preserve.clone # Should preserve this
+          BinaryAccessor.write(data, 0, -16, :BLOCK, buffer, :BIG_ENDIAN, :ERROR)
+          expect(buffer[0..-3]).to eql data
+          expect(buffer[-2..-1]).to eql preserve
+          data = BinaryAccessor.read(0, data.length*8 + 16, :BLOCK, buffer, :BIG_ENDIAN)
+          expect(data).to eql buffer
+        end
+
+        it "writes a block to another small buffer preserving the end" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          preserve = [0xBEEF0123].pack("N")
+          buffer = "\x00\x01" + preserve.clone # Should preserve this
+          BinaryAccessor.write(data, 16, -32, :BLOCK, buffer, :BIG_ENDIAN, :ERROR)
+          expect(buffer[0..1]).to eql "\x00\x01"
+          expect(buffer[2..-5]).to eql data
+          expect(buffer[-4..-1]).to eql preserve
+          data = BinaryAccessor.read(0, 16 + data.length*8 + 32, :BLOCK, buffer, :BIG_ENDIAN)
+          expect(data).to eql buffer
+        end
+
+        it "writes a block to a small buffer overwriting the end" do
+          data = ''
+          512.times do |index|
+            data << [index].pack("n")
+          end
+          preserve = [0xBEEF].pack("n")
+          buffer = [0xDEAD].pack("n") # Should write over this
+          buffer << preserve.clone # Should preserve this
+          BinaryAccessor.write(data, 0, -16, :BLOCK, buffer, :BIG_ENDIAN, :ERROR)
+          expect(buffer[0..-3]).to eql data
+          expect(buffer[-2..-1]).to eql preserve
+          data = BinaryAccessor.read(0, data.length*8 + 16, :BLOCK, buffer, :BIG_ENDIAN)
+          expect(data).to eql buffer
+        end
+
+        it "writes a smaller block in the middle of a buffer" do
+          data = ''
+          buffer = ''
+          256.times do |index|
+            data << [index].pack("n")
+          end
+          512.times do
+            buffer << [0xDEAD].pack("n")
+          end
+          expected = buffer.clone
+          BinaryAccessor.write(data, 128*8, -128*8, :BLOCK, buffer, :BIG_ENDIAN, :ERROR)
+          expect(buffer.length).to eql (128 + 512 + 128)
+          expect(buffer[0...128]).to eql expected[0...128]
+          expect(buffer[128...-128]).to eql data
+          expect(buffer[-128..-1]).to eql expected[0...128]
+        end
+
+        it "writes a larger block in the middle of a buffer" do
+          data = ''
+          buffer = ''
+          256.times do |index|
+            data << [index].pack("n")
+          end
+          512.times do
+            buffer << [0xDEAD].pack("n")
+          end
+          expected = buffer.clone
+          BinaryAccessor.write(data, 384*8, -384*8, :BLOCK, buffer, :BIG_ENDIAN, :ERROR)
+          expect(buffer.length).to eql (384 + 512 + 384)
+          expect(buffer[0...384]).to eql expected[0...384]
+          expect(buffer[384...-384]).to eql data
+          expect(buffer[-384..-1]).to eql expected[0...384]
+        end
+
+        it "complains when the negative index exceeds the buffer length" do
+          data = "\x01"
+          buffer = ''
+          16.times do
+            buffer << [0xDEAD].pack("n")
+          end
+          expect { BinaryAccessor.write(data, 0, -2024*8, :BLOCK, buffer, :BIG_ENDIAN, :ERROR) }.to raise_error(ArgumentError, "32 byte buffer insufficient to write BLOCK at bit_offset 0 with bit_size -16192")
+        end
+      end
+
       it "writes blocks with negative bit_offsets" do
         BinaryAccessor.write(@baseline_data[0..1], -16, 16, :BLOCK, @data, :BIG_ENDIAN, :ERROR)
         expect(@data[-2..-1]).to eql(@baseline_data[0..1])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler