code.ossystems Code Review - openembedded-core.git/blob

   1 From c8903aa27dc9de1d9efeed9d1f7894f1019548f7 Mon Sep 17 00:00:00 2001
   2 From: Nikos Mavrogiannopoulos <nmav@redhat.com>
   3 Date: Tue, 26 Jul 2016 08:49:15 +0200
   4 Subject: [PATCH 3/4] parser_aux: corrected potential null pointer dereferences
   5
   6 ---
   7 Upstream-Status: Backport
   8 Signed-off-by: Khem Raj <raj.khem@gmail.com>
   9
  10  lib/parser_aux.c | 12 ++++++------
  11  1 file changed, 6 insertions(+), 6 deletions(-)
  12
  13 diff --git a/lib/parser_aux.c b/lib/parser_aux.c
  14 index 2285b20..12ee16f 100644
  15 --- a/lib/parser_aux.c
  16 +++ b/lib/parser_aux.c
  17 @@ -637,7 +637,7 @@ _asn1_change_integer_value (asn1_node node)
  18                       p = NULL;
  19                       break;
  20                     }
  21 -                 if (p->right)
  22 +                 if (p && p->right)
  23                     {
  24                       p = p->right;
  25                       break;
  26 @@ -753,7 +753,7 @@ _asn1_expand_object_id (asn1_node node)
  27
  28        if (move == RIGHT)
  29         {
  30 -         if (p->right)
  31 +         if (p && p->right)
  32             p = p->right;
  33           else
  34             move = UP;
  35 @@ -828,7 +828,7 @@ _asn1_expand_object_id (asn1_node node)
  36
  37        if (move == RIGHT)
  38         {
  39 -         if (p->right)
  40 +         if (p && p->right)
  41             p = p->right;
  42           else
  43             move = UP;
  44 @@ -898,7 +898,7 @@ _asn1_type_set_config (asn1_node node)
  45
  46        if (move == RIGHT)
  47         {
  48 -         if (p->right)
  49 +         if (p && p->right)
  50             p = p->right;
  51           else
  52             move = UP;
  53 @@ -1007,7 +1007,7 @@ _asn1_check_identifier (asn1_node node)
  54                   p = NULL;
  55                   break;
  56                 }
  57 -             if (p->right)
  58 +             if (p && p->right)
  59                 {
  60                   p = p->right;
  61                   break;
  62 @@ -1067,7 +1067,7 @@ _asn1_set_default_tag (asn1_node node)
  63                   p = NULL;
  64                   break;
  65                 }
  66 -             if (p->right)
  67 +             if (p && p->right)
  68                 {
  69                   p = p->right;
  70                   break;
  71 --
  72 1.9.1
  73