diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-07-05 17:39:00 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-07-05 17:40:41 +0200 |
| commit | 21a1bd615400b4f97991faa50545573188100fbb (patch) | |
| tree | 76aeb5f659a0a961608599665ddded90d919dc9c /debian | |
| parent | Document changes and release 3.8.0-2 (diff) | |
| download | krb5-auth-dialog-21a1bd615400b4f97991faa50545573188100fbb.tar.gz krb5-auth-dialog-21a1bd615400b4f97991faa50545573188100fbb.tar.bz2 krb5-auth-dialog-21a1bd615400b4f97991faa50545573188100fbb.zip | |
Fix krb5_principal_compare crashes on NULL arguments
Thanks: Petter Reinholdtsen
Closes: #714825
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch b/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch new file mode 100644 index 0000000..44dd70d --- /dev/null +++ b/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch @@ -0,0 +1,26 @@ +From: Petter Reinholdtsen <pere@hungry.com> +Date: Thu, 4 Jul 2013 09:32:18 +0200 +Subject: krb5_principal_compare crashes on NULL arguments + +Debian Bug #714825 +--- + src/ka-kerberos.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c +index db5cddd..0867234 100644 +--- a/src/ka-kerberos.c ++++ b/src/ka-kerberos.c +@@ -221,8 +221,10 @@ credentials_expiring_real (KaApplet *applet) + } + + /* copy principal from cache if any */ +- if (krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { +- krb5_free_principal (kcontext, kprincipal); ++ if (kprincipal == NULL || ++ krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { ++ if (kprincipal) ++ krb5_free_principal (kcontext, kprincipal); + krb5_copy_principal (kcontext, my_creds.client, &kprincipal); + } + creds_expiry = my_creds.times.endtime; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..dc7e57e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-krb5_principal_compare-crashes-on-NULL-arguments.patch |