commit 99b6d09fafa21ebb1b2de493eb1f7cc315449662
author Dan Albert <danalbert@google.com> Thu Jan 28 18:32:17 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 28 18:32:17 2016 +0000
tree b3d9964b917a19bdeb55741ee4d4ebf0e13c43fe
parent dfec0a163814719f38f74a1b71a9d06a22772fd6
parent e18b85ca88ae5fa67f4d0c8698ceaa64cfda16de

Merge "Subject: [PATCH] Fix heap-use-after-free in reference-ril.c found by AddressSaniziter."

reference-ril/reference-ril.c

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index 45340e3..b9baef1 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -3110,7 +3110,6 @@
 
         err = at_tok_nextstr(&p, &response);
 
-        free(line);
         if (err != 0) {
             RLOGE("invalid NITZ line %s\n", s);
         } else {
@@ -3118,6 +3117,7 @@
                 RIL_UNSOL_NITZ_TIME_RECEIVED,
                 response, strlen(response));
         }
+        free(line);
     } else if (strStartsWith(s,"+CRING:")
                 || strStartsWith(s,"RING")
                 || strStartsWith(s,"NO CARRIER")