Backport 2 crash fixes from dnsmasq repo:
Note sure if we need the src/option.c, apparently it's to deal with syntax errors in the configuration, but no objection on my part. Please commit to SVN.
Oh, please do not bump PORTEPOCH, but set PORTREVISION.
As discussed on IRC; I've commited this as r405491.