CVE-2013-4484 fix backport

by Ingvar Hagelund from
https://bugzilla.redhat.com/show_bug.cgi?id=1025127
CVE-2013-4484 backport