Re: [MM] [PATCH v2] broadband-modem: check for NULL response in parse_caps_{cpin, cgmm, gcap}

2012-11-27 Thread Aleksander Morgado 
On 27/11/12 08:56, Ben Chan wrote:
> ---
>  src/mm-broadband-modem.c |   11 ++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 


Pushed, thanks.


> diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
> index 9161c82..174de9d 100644
> --- a/src/mm-broadband-modem.c
> +++ b/src/mm-broadband-modem.c
> @@ -435,10 +435,13 @@ parse_caps_gcap (MMBaseModem *self,
>  const ModemCaps *cap = modem_caps;
>  guint32 ret = 0;
>  
> +if (!response)
> +return FALSE;
> +
>  /* Some modems (Huawei E160g) won't respond to +GCAP with no SIM, but
>   * will respond to ATI.  Ignore the error and continue.
>   */
> -if (response && strstr (response, "+CME ERROR:"))
> +if (strstr (response, "+CME ERROR:"))
>  return FALSE;
>  
>  while (cap->name) {
> @@ -465,6 +468,9 @@ parse_caps_cpin (MMBaseModem *self,
>   GVariant **result,
>   GError **result_error)
>  {
> +if (!response)
> +return FALSE;
> +
>  if (strcasestr (response, "SIM PIN") ||
>  strcasestr (response, "SIM PUK") ||
>  strcasestr (response, "PH-SIM PIN") ||
> @@ -498,6 +504,9 @@ parse_caps_cgmm (MMBaseModem *self,
>   GVariant **result,
>   GError **result_error)
>  {
> +if (!response)
> +return FALSE;
> +
>  /* This check detects some really old Motorola GPRS dongles and phones */
>  if (strstr (response, "GSM900") ||
>  strstr (response, "GSM1800") ||
> 


-- 
Aleksander
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list

[MM] [PATCH v2] broadband-modem: check for NULL response in parse_caps_{cpin, cgmm, gcap}

2012-11-26 Thread Ben Chan 
---
 src/mm-broadband-modem.c |   11 ++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 9161c82..174de9d 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -435,10 +435,13 @@ parse_caps_gcap (MMBaseModem *self,
 const ModemCaps *cap = modem_caps;
 guint32 ret = 0;
 
+if (!response)
+return FALSE;
+
 /* Some modems (Huawei E160g) won't respond to +GCAP with no SIM, but
  * will respond to ATI.  Ignore the error and continue.
  */
-if (response && strstr (response, "+CME ERROR:"))
+if (strstr (response, "+CME ERROR:"))
 return FALSE;
 
 while (cap->name) {
@@ -465,6 +468,9 @@ parse_caps_cpin (MMBaseModem *self,
  GVariant **result,
  GError **result_error)
 {
+if (!response)
+return FALSE;
+
 if (strcasestr (response, "SIM PIN") ||
 strcasestr (response, "SIM PUK") ||
 strcasestr (response, "PH-SIM PIN") ||
@@ -498,6 +504,9 @@ parse_caps_cgmm (MMBaseModem *self,
  GVariant **result,
  GError **result_error)
 {
+if (!response)
+return FALSE;
+
 /* This check detects some really old Motorola GPRS dongles and phones */
 if (strstr (response, "GSM900") ||
 strstr (response, "GSM1800") ||
-- 
1.7.7.3

___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list