[systemd-commits] 2 commits - hwdb/70-mouse.hwdb src/shared

[David Herrmann]

 hwdb/70-mouse.hwdb    |    4 ++++
 src/shared/time-dst.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit de72f11bd1d98956baaae2192094b4f59ed2d307
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Dec 15 11:26:38 2014 +0100

    hwdb: Logitech MX 518

diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 36778d5..65a8c32 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -130,6 +130,10 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
 mouse:usb:v046dpc50e:name:Logitech USB Receiver:
  MOUSE_DPI=800 at 125
 
+# Logitech MX 518
+mouse:usb:v046dpc01e:name:Logitech USB-PS/2 Optical Mouse:
+ MOUSE_DPI=400 at 125 *800 at 125 1600 at 125
+
 # Logitech Wireless Mouse M185
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:
 # Logitech M705 (marathon mouse)

commit e17fb3c1dd21929119968325c46ab98630446032
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Dec 15 13:06:48 2014 +0100

    shared: time-dst: Avoid buffer overflow
    
    Commit 681f9718 introduced an additional null terminator for the zone names.
    Increase the allocation of "transitions" to actually make room for this.

diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c
index 926d22b..1ce6f72 100644
--- a/src/shared/time-dst.c
+++ b/src/shared/time-dst.c
@@ -183,7 +183,8 @@ read_again:
                         return -EINVAL;
         }
 
-        transitions = malloc0(total_size + tzspec_len);
+        /* leave space for additional zone_names zero terminator */
+        transitions = malloc0(total_size + tzspec_len + 1);
         if (transitions == NULL)
                 return -EINVAL;