Merge pull request #73 from ezyang/pr/fix-segfault

ezyang · web-flow · commit 7b20b4cbc35a · 2016-09-08T12:04:24.000-07:00
Fix segfault from inconsistent macro use.
diff --git a/cbits/HsUnix.c b/cbits/HsUnix.c
@@ -110,7 +110,7 @@ char *__hscore_d_name( struct dirent* d )
 
 void __hscore_free_dirent(struct dirent *dEnt)
 {
-#if HAVE_READDIR_R
+#if HAVE_READDIR_R && USE_READDIR_R
   free(dEnt);
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ char __hscore_d_name( struct dirent d )`
`110`	`110`
`111`	`111`	`void __hscore_free_dirent(struct dirent *dEnt)`
`112`	`112`	`{`
`113`		`-#if HAVE_READDIR_R`
	`113`	`+#if HAVE_READDIR_R && USE_READDIR_R`
`114`	`114`	`free(dEnt);`
`115`	`115`	`#endif`
`116`	`116`	`}`