Merge branch '3.4'

axfor · Jun 21, 2014 · d514be9 · d514be9
2 parents 5914c0c + 91f87d4
commit d514be9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2014.06.22 Kentaro FUKUCHI <kentaro@fukuchi.org>
+	* qrencode.c:
+	  - A memory leak bug has been fixed. (Thanks to @win32asm)
+
 2014.02.14 Kentaro FUKUCHI <kentaro@fukuchi.org>
 	* qrinput.c:
 	  - Minor documentation fix.

diff --git a/README b/README
@@ -141,5 +141,5 @@ Daniel Dörrhöfer      - RLE option, some bug fixes, Travis configuration
 Shigeyuki Hirai, Paul Janssens, wangsai, Gavan Fantom, Matthew Baker, Rob Ryan,
 Fred Steinhaeuser, Terry Burton, chisj, vlad417, Petr, Hassan Hajji,
 Emmanuel Blot, ßlúèÇhîp, Heiko Becker, Gavin Andresen, David Binderman,
-ralgozino, Sean McMurray
+ralgozino, Sean McMurray, win32asm
  - bug report / suggestion
diff --git a/qrencode.c b/qrencode.c
@@ -521,6 +521,9 @@ __STATIC QRcode *QRcode_encodeMask(QRinput *input, int mask)
 		goto EXIT;
 	}
 	qrcode = QRcode_new(version, width, masked);
+	if(qrcode == NULL) {
+		free(masked);
+	}
 
 EXIT:
 	QRraw_free(raw);