hrev50857 adds 2 changesets to branch 'master'
old head: e6004b7729710ea60bdcce10e551508a5a855a1f
new head: 4d83a710f5cd775ec282f8dd28c22a460cdc05b0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=4d83a710f5cd+%5Ee6004b772971
----------------------------------------------------------------------------
7cfdd9242c0f: h2generic.cpp: fix use after free.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
4d83a710f5cd: makefile-engine: Fix catkey generation.
Fixes #13146.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
[ Kacper Kasper <kacperkasper@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 1 deletion(-)
data/develop/makefile-engine | 2 +-
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp | 1 +
############################################################################
Commit: 7cfdd9242c0fcfd4dbcae9b15a249697072f3369
URL: http://cgit.haiku-os.org/haiku/commit/?id=7cfdd9242c0f
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Sun Jan 8 20:38:38 2017 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Jan 10 22:17:41 2017 UTC
h2generic.cpp: fix use after free.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
index 9dad099..d0d6b2f 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
@@ -149,6 +149,7 @@ bail1:
delete_sem(new_bt_dev->cmd_complete);
bail0:
free(new_bt_dev);
+ new_bt_dev = NULL;
exit:
return new_bt_dev;
}
############################################################################
Revision: hrev50857
Commit: 4d83a710f5cd775ec282f8dd28c22a460cdc05b0
URL: http://cgit.haiku-os.org/haiku/commit/?id=4d83a710f5cd
Author: Kacper Kasper <kacperkasper@xxxxxxxxx>
Date: Tue Jan 10 22:21:39 2017 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Jan 10 22:21:39 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13146
makefile-engine: Fix catkey generation.
Fixes #13146.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine
index fcf0a78..504d9c5 100644
--- a/data/develop/makefile-engine
+++ b/data/develop/makefile-engine
@@ -312,7 +312,7 @@ $(CATALOGS_DIR)/%.catalog : $(CATKEYS_DIR)/%.catkeys
# Rule to preprocess program sources into file ready for collecting catkeys.
$(OBJ_DIR)/$(NAME).pre : $(SRCS)
- -cat $(SRCS) | $(CC) -E -x c++ $(INCLUDES) $(CFLAGS)
-DB_COLLECTING_CATKEYS - > $(OBJ_DIR)/$(NAME).pre
+ -cat $(SRCS) | $(CC) -E -x c++ $(INCLUDES) $(CFLAGS)
-DB_COLLECTING_CATKEYS - | grep -av '^#' > $(OBJ_DIR)/$(NAME).pre
# Rules to collect localization catkeys.
catkeys : $(CATKEYS_DIR)/en.catkeys
