Merge branch 'release/v1.1.1' into master

2f091d9c · Federico Vaga · 18b1a403 · dffe29dc · 2f091d9c · 2f091d9c
Commit 2f091d9c authored Oct 26, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

CHANGELOG.rst CHANGELOG.rst +7 -0

Makefile distribution/Makefile +1 -1

ipmifru.c tools/lib/ipmifru.c +1 -1

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,13 @@
 Changelog
 =========

+1.1.1 - 2020-10-27
+==================
+
+Bugfix
+------
+- sw: fix a NULL pointer dereference
+
 1.1.0 - 2020-10-26
 ==================


--- a/distribution/Makefile
+++ b/distribution/Makefile
@@ -59,7 +59,7 @@ sources-tar: sources-build
 sources: sources-tar

 srpm-changelog: sources
-	$(eval $@_pattern := ^\[([0-9]+\.[0-9]+\.[0-9]+)\]\s-\s([0-9]{4}-[0-9]{2}-[0-9]{2})$)
+	$(eval $@_pattern := ^([0-9]+\.[0-9]+\.[0-9]+)\s-\s([0-9]{4}-[0-9]{2}-[0-9]{2})$)
 	$(eval $@_replace := echo -e "\n"\\* `date --date="\2" "+%a %b %d %Y"` "\1")

 	@cp -a $(PKG_SOURCES)/CHANGELOG.rst $(SOURCES)/CHANGELOG

--- a/tools/lib/ipmifru.c
+++ b/tools/lib/ipmifru.c
@@ -13,7 +13,7 @@ static void *fru_alloc(size_t size)
 {
 	void *buf = malloc(size);

-        if (!buf)
+        if (buf)
 		memset(buf, 0, size);

 	return buf;