chiark / gitweb /
fix assertion to have correct test
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 15 Jan 2012 00:42:31 +0000 (00:42 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 15 Jan 2012 00:42:31 +0000 (00:42 +0000)
debian/changelog
ipif/service.c

index 35d54fc227519f9562cb78e2eaedfd9aa50da564..f5e6d9a90bc8899227d8c7f327b11bb082df612d 100644 (file)
@@ -1,3 +1,9 @@
+userv-utils (0.4.2) unstable; urgency=low
+
+  * 
+
+ --
+
 userv-utils (0.4.1) unstable; urgency=low
 
   ipif bugfixes:
 userv-utils (0.4.1) unstable; urgency=low
 
   ipif bugfixes:
index b9d8b44cbd56ceb1188a9a79b48459538b4dddd1..39994169ea567ea8cb53aff07d29c9741de92fed 100644 (file)
@@ -863,7 +863,7 @@ static void copydata(void) {
       r= read(0, input_buf + input_waiting, want);
       if (r>0) {
        input_waiting += r;
       r= read(0, input_buf + input_waiting, want);
       if (r>0) {
        input_waiting += r;
-       assert(r < sizeof(input_buf));
+       assert(input_waiting < sizeof(input_buf));
        more_rx_data(input_buf, rx_packet_buf);
       } else if (r==0) {
        terminate(0);
        more_rx_data(input_buf, rx_packet_buf);
       } else if (r==0) {
        terminate(0);