[haiku-commits] haiku: hrev54363 - in src: bin add-ons/kernel/file_systems/userlandfs/server/fuse system/kernel/arch/x86

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 25 Jun 2020 10:11:48 -0400 (EDT)

hrev54363 adds 3 changesets to branch 'master'
old head: ece405c74999f0fda3231711c1eac3a615f39f42
new head: 1e9cdb0bd8b5c58627915caf0f518ab5c43b4da4
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=1e9cdb0bd8b5+%5Eece405c74999

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

69d16976497b: userlandfs/server/fuse: Fix PVS V773
  
  Fix FUSEVolume::OpenAttr() was exited
  without releasing the 'cookie' pointer.
  
  Change-Id: I8bf08268c77e1c9704227b1d4c7c94ddcc8b09a3
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/2947
  Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

c89d626d0e6a: kernel/arch/x86: Fix PVS V773
  
  Fix choose_link_device_configurations() was exited
  without releasing the 'link' pointer.
  
  Change-Id: I1620e63779975305776ffad717cbe2c07f4e022f
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/2948
  Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

1e9cdb0bd8b5: bin/setversion: Fix if condition
  
  Fix str = "gm" could not be checked.
  Pointed out by cppcheck.
  
  Change-Id: I433a98cef851e07be0905eee2f5100a02fa6a32b
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/2949
  Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

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

3 files changed, 6 insertions(+), 2 deletions(-)
.../kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp     | 4 +++-
src/bin/setversion.cpp                                            | 2 +-
src/system/kernel/arch/x86/irq_routing_table.cpp                  | 2 ++

############################################################################

Commit:      69d16976497be026b2058532dae0153de0442882
URL:         https://git.haiku-os.org/haiku/commit/?id=69d16976497b
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Mon Jun 15 21:01:11 2020 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Thu Jun 25 14:11:37 2020 UTC

userlandfs/server/fuse: Fix PVS V773

Fix FUSEVolume::OpenAttr() was exited
without releasing the 'cookie' pointer.

Change-Id: I8bf08268c77e1c9704227b1d4c7c94ddcc8b09a3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2947
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

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

diff --git 
a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp 
b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
index a358c74a04..87538a9fd7 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
@@ -2211,8 +2211,10 @@ FUSEVolume::OpenAttr(void* _node, const char* name, int 
openMode,
 
        int bytesRead = fuse_fs_getxattr(fFS, path, name, cookie->Buffer(),
                attrSize);
-       if (bytesRead < 0)
+       if (bytesRead < 0) {
+               delete cookie;
                return bytesRead;
+       }
 
        *_cookie = cookie;
 

############################################################################

Commit:      c89d626d0e6ad4a384b4be5046cf4e376f2829df
URL:         https://git.haiku-os.org/haiku/commit/?id=c89d626d0e6a
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Mon Jun 15 21:02:31 2020 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Thu Jun 25 14:11:37 2020 UTC

kernel/arch/x86: Fix PVS V773

Fix choose_link_device_configurations() was exited
without releasing the 'link' pointer.

Change-Id: I1620e63779975305776ffad717cbe2c07f4e022f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2948
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

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

diff --git a/src/system/kernel/arch/x86/irq_routing_table.cpp 
b/src/system/kernel/arch/x86/irq_routing_table.cpp
index 269041592d..f810ed0ae4 100644
--- a/src/system/kernel/arch/x86/irq_routing_table.cpp
+++ b/src/system/kernel/arch/x86/irq_routing_table.cpp
@@ -236,12 +236,14 @@ choose_link_device_configurations(acpi_module_info* acpi,
                        link->possible_irqs);
                if (status != B_OK) {
                        panic("failed to read possible irqs of link device");
+                       delete link;
                        return status;
                }
 
                status = read_current_irq(acpi, link->handle, 
link->current_irq);
                if (status != B_OK) {
                        panic("failed to read current irq of link device");
+                       delete link;
                        return status;
                }
 

############################################################################

Revision:    hrev54363
Commit:      1e9cdb0bd8b5c58627915caf0f518ab5c43b4da4
URL:         https://git.haiku-os.org/haiku/commit/?id=1e9cdb0bd8b5
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Wed Jun 24 21:25:13 2020 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Thu Jun 25 14:11:37 2020 UTC

bin/setversion: Fix if condition

Fix str = "gm" could not be checked.
Pointed out by cppcheck.

Change-Id: I433a98cef851e07be0905eee2f5100a02fa6a32b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2949
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

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

diff --git a/src/bin/setversion.cpp b/src/bin/setversion.cpp
index b27ba12762..e99d673f8e 100644
--- a/src/bin/setversion.cpp
+++ b/src/bin/setversion.cpp
@@ -62,7 +62,7 @@ convertVariety(const char *str)
                return 2;
        if (!strcmp(str, "g") || !strcmp(str, "gamma"))
                return 3;
-       if (strcmp(str, "gm") || !strcmp(str, "goldenmaster"))
+       if (!strcmp(str, "gm") || !strcmp(str, "goldenmaster"))
                return 4;
        if (!strcmp(str, "f") || !strcmp(str, "final"))
                return 5;


Other related posts:

  • » [haiku-commits] haiku: hrev54363 - in src: bin add-ons/kernel/file_systems/userlandfs/server/fuse system/kernel/arch/x86 - waddlesplash