[haiku-commits] haiku: hrev43710 - src/add-ons/kernel/drivers/audio/ac97/sis7018

  • From: zharik@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 2 Feb 2012 21:13:58 +0100 (CET)

hrev43710 adds 1 changeset to branch 'master'
old head: d9744a0dfc72d99e9a89493c2658eb7027514b3c
new head: 1acd796b6b153d1279dbe0c261886474514fba57

----------------------------------------------------------------------------

1acd796: [Coverity] Add check for NULL before calling strlcpy.
  
  * Fixes CID11207.

                                        [ Siarzhuk Zharski <zharik@xxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43710
Commit:      1acd796b6b153d1279dbe0c261886474514fba57
URL:         http://cgit.haiku-os.org/haiku/commit/?id=1acd796
Author:      Siarzhuk Zharski <zharik@xxxxxx>
Date:        Thu Feb  2 20:10:42 2012 UTC

----------------------------------------------------------------------------

1 files changed, 2 insertions(+), 1 deletions(-)
.../kernel/drivers/audio/ac97/sis7018/Mixer.cpp    |    3 ++-

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp 
b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
index 242643e..5ad29ee 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
+++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
@@ -549,7 +549,8 @@ Mixer::_CreateMIXControlGroup(multi_mix_control_info* 
MultiInfo, int32& index,
                Controls[index].flags           = B_MULTI_MIX_MUX;
                Controls[index].parent          = groupIndex;
                Controls[index].string          = S_null;
-               strlcpy(Controls[index].name, Info.fExName,
+               if (Info.fExName != NULL)
+                       strlcpy(Controls[index].name, Info.fExName,
                                                                
sizeof(Controls[index].name));
 
                TRACE("MUX:%#010x\n", Controls[index].id);


Other related posts:

  • » [haiku-commits] haiku: hrev43710 - src/add-ons/kernel/drivers/audio/ac97/sis7018 - zharik