- Timestamp:
- 01/11/19 16:24:49 (2 years ago)
- Branches:
- develop
- Children:
- 2d16fc7
- Parents:
- ec19a99
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
rfce4572 re0d922a 789 789 dag_record_t *erfptr = 0; 790 790 erfptr = (dag_record_t *)packet->header; 791 uint8_t type = (erfptr->type & 0x7f); 791 uint8_t type; 792 793 if (packet->header == NULL) { 794 return ~0; 795 } 796 797 type = (erfptr->type & 0x7f); 792 798 if (type != TYPE_LEGACY) { 793 799 /* The top-most bit is now used to indicate the presence of … … 806 812 dag_record_t *erfptr = 0; 807 813 erfptr = (dag_record_t *)packet->header; 808 return erfptr->flags.iface; 814 if (packet->header) { 815 return erfptr->flags.iface; 816 } 817 return TRACE_DIR_UNKNOWN; 809 818 } 810 819 … … 812 821 dag_record_t *erfptr = 0; 813 822 erfptr = (dag_record_t *)packet->header; 823 824 if (packet->header == NULL) { 825 return TRACE_DIR_UNKNOWN; 826 } 814 827 erfptr->flags.iface = direction; 815 828 return erfptr->flags.iface; … … 819 832 dag_record_t *erfptr = 0; 820 833 erfptr = (dag_record_t *)packet->header; 834 835 if (erfptr == NULL) { 836 return 0; 837 } 821 838 return bswap_le_to_host64(erfptr->ts); 822 839 } … … 828 845 uint16_t wlen, rlen; 829 846 830 if (packet->payload == NULL )847 if (packet->payload == NULL || packet->header == NULL) 831 848 return 0; 832 849 … … 847 864 erfptr = (dag_record_t *)packet->header; 848 865 866 if (packet->header == NULL) { 867 return 0; 868 } 869 849 870 if ((erfptr->type & 0x7f) == TYPE_META) 850 871 return 0; … … 862 883 } 863 884 erfptr = (dag_record_t *)packet->header; 885 886 if (packet->header == NULL) { 887 return ~0U; 888 } 864 889 865 890 if(size > trace_get_capture_length(packet) || (erfptr->type & 0x7f) == TYPE_META) {
Note: See TracChangeset
for help on using the changeset viewer.