must handle alignment for packets w/o data

SCCS-vsn: sys/net/slcompress.c 7.4

diff --git a/usr/src/sys/net/slcompress.c b/usr/src/sys/net/slcompress.c
index 2822113..83c014c 100644 (file)
--- a/usr/src/sys/net/slcompress.c
+++ b/usr/src/sys/net/slcompress.c
@@ -1,5 +1,5 @@
 /*
 /*

- *     @(#)slcompress.c        7.3 (Berkeley) %G%
+ *     @(#)slcompress.c        7.4 (Berkeley) %G%

  *
  *                     THIS CODE IS NOT FOR DISTRIBUTION!
  *     KEEP YOUR GRUBBY HANDS OFF UNLESS AUTHORIZED BY VAN JACOBSON TO COPY!
  *
  *                     THIS CODE IS NOT FOR DISTRIBUTION!
  *     KEEP YOUR GRUBBY HANDS OFF UNLESS AUTHORIZED BY VAN JACOBSON TO COPY!


@@ -464,8 +464,9 @@ sl_uncompress_tcp(bufp, len, type, comp)
                INCR(sls_errorin)
                return (0);
        }
                INCR(sls_errorin)
                return (0);
        }

-       if (len && ((int)cp & ~3) != (int)cp) {
-               (void) bcopy((caddr_t)cp, (caddr_t)((int)cp &~ 3), len);
+       if ((int)cp & 3) {
+               if (len > 0)
+                       BCOPY(cp, (int)cp &~ 3, len);

                cp = (u_char *)((int)cp &~ 3);
        }
        cp -= cs->cs_hlen;
                cp = (u_char *)((int)cp &~ 3);
        }
        cp -= cs->cs_hlen;