diff options
| author | Sam Varshavchik | 2017-11-26 13:07:30 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2017-11-26 13:07:30 -0500 |
| commit | 4ff3f3b37394fec89209f4b3b049846779cd9a2c (patch) | |
| tree | 97b0c2dc4a9a812509339071aec2a4e528d8d945 | |
| parent | 95e0ece16f52b1ab0f000fbbe2466fbc1922ed75 (diff) | |
| download | courier-libs-4ff3f3b37394fec89209f4b3b049846779cd9a2c.tar.bz2 | |
Misc fixes.
Potential null pointer dereference in pcp.c. Convert waitlib to use
libtool.
| -rw-r--r-- | sqwebmail/ChangeLog | 4 | ||||
| -rw-r--r-- | sqwebmail/pcp.c | 4 | ||||
| -rw-r--r-- | tcpd/Makefile.am | 4 | ||||
| -rw-r--r-- | waitlib/Makefile.am | 8 | ||||
| -rw-r--r-- | waitlib/configure.ac | 4 |
5 files changed, 14 insertions, 10 deletions
diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index eba0a24..29d05fd 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -2,6 +2,10 @@ 2017-11-26 Sam Varshavchik <mrsam@courier-mta.com> + * pcp.c (sqpcp_eventstart): Fix null pointer dereference. + +2017-11-26 Sam Varshavchik <mrsam@courier-mta.com> + * Tweaks to the RPM spec file. * libs/rfc2045/rfc2045reply.c (mkreply): Fix null pointer diff --git a/sqwebmail/pcp.c b/sqwebmail/pcp.c index 824aa89..ce665e9 100644 --- a/sqwebmail/pcp.c +++ b/sqwebmail/pcp.c @@ -937,7 +937,7 @@ void sqpcp_eventstart() h.value, sqwebmail_content_charset, NULL, NULL); - if (!subj_buf) + if (subj_buf) subj_buf=strdup(subj_buf); if (subj_buf) @@ -3146,7 +3146,7 @@ struct display_retr_participant_list { struct display_retr { FILE *f; - + struct display_retr_time_list *time_list; struct display_retr_participant_list *participant_list; diff --git a/tcpd/Makefile.am b/tcpd/Makefile.am index f6bf729..7c0e23d 100644 --- a/tcpd/Makefile.am +++ b/tcpd/Makefile.am @@ -29,7 +29,7 @@ couriertcpd_DEPENDENCIES= libspipe.la \ @dblibrary@ \ ../liblock/liblock.la\ ../numlib/libnumlib.la\ - ../waitlib/libwaitlib.a\ + ../waitlib/libwaitlib.la\ ../soxwrap/libsoxwrap.a\ ../md5/libmd5.la ../random128/librandom128.la @@ -40,7 +40,7 @@ couriertcpd_LDADD= libspipe.la \ @dblibrary@ \ ../liblock/liblock.la\ ../numlib/libnumlib.la\ - ../waitlib/libwaitlib.a\ + ../waitlib/libwaitlib.la\ ../soxwrap/libsoxwrap.a\ ../md5/libmd5.la ../random128/librandom128.la \ $(couriertcpd_t:%=-Wl,%) diff --git a/waitlib/Makefile.am b/waitlib/Makefile.am index c4871c1..33be798 100644 --- a/waitlib/Makefile.am +++ b/waitlib/Makefile.am @@ -3,16 +3,16 @@ # distribution information. -noinst_LIBRARIES=libwaitlib.a +noinst_LTLIBRARIES=libwaitlib.la noinst_PROGRAMS=testwait EXTRA_DIST=confwait.c -libwaitlib_a_SOURCES=waitlib.c waitlib.h waitlib2.c +libwaitlib_la_SOURCES=waitlib.c waitlib.h waitlib2.c testwait_SOURCES=testwait.c testwait2.c -testwait_DEPENDENCIES=libwaitlib.a -testwait_LDADD=libwaitlib.a +testwait_DEPENDENCIES=libwaitlib.la +testwait_LDADD=libwaitlib.la check-am: ./testwait diff --git a/waitlib/configure.ac b/waitlib/configure.ac index b69e5cd..695e199 100644 --- a/waitlib/configure.ac +++ b/waitlib/configure.ac @@ -17,8 +17,8 @@ dnl Checks for programs. AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S -AC_PROG_RANLIB AC_PROG_CC +AC_PROG_LIBTOOL dnl Checks for libraries. @@ -84,7 +84,7 @@ wait3) else use_wait3=no fi - + if test "$waitlib_cv_SYS_WAITBROKEN$use_wait3" = "yesno" then AC_MSG_ERROR([I give up -- neither wait nor wait3 works properly]) |