From 9aff3bc407edc8e56d931431c989dab889b43212 Mon Sep 17 00:00:00 2001 From: Andrew Flegg Date: Sat, 18 Dec 2010 14:59:40 +0000 Subject: [PATCH] Ensure that a corrupt/broken OAuth string won't cause a crash at startup. (Fixes MB#11490, reported by Ove Nordstrom) --- .../src/org/maemo/hermes/engine/provider_oauth.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/src/org/maemo/hermes/engine/provider_oauth.py b/package/src/org/maemo/hermes/engine/provider_oauth.py index 95b8684..690dcef 100644 --- a/package/src/org/maemo/hermes/engine/provider_oauth.py +++ b/package/src/org/maemo/hermes/engine/provider_oauth.py @@ -175,10 +175,15 @@ class OAuthProvider(org.maemo.hermes.engine.provider.Provider): """Returns an oauth.OAuthToken, or None if the gconf value is empty""" token_str = self._gc.get_string(self.GCONF_ACCESS_TOKEN % (self.get_id())) - print token_str if not token_str or len(token_str) < 8: return None - return oauth.OAuthToken.from_string(token_str) + try: + return oauth.OAuthToken.from_string(token_str) + except KeyError, e: + print token_str + import traceback + traceback.print_exc() + return None # ----------------------------------------------------------------------- -- 1.7.9.5