Commit c0655ad9 authored by BenceJanosSzabo's avatar BenceJanosSzabo
Browse files

Fixed RAW fatal error bug (Bug 521125)



Change-Id: I3e0d98e37d523d5ba6783025ef878eded83355af
Signed-off-by: default avatarBenceJanosSzabo <bence.janos.szabo@ericsson.com>
parent ab894bff
......@@ -1986,7 +1986,7 @@ namespace Common {
raw_length=-1;
return raw_length;
}
l=cf->get_type()->get_raw_length();
l=cf->get_type()->get_type_refd_last()->get_raw_length();
if(l==-1){
raw_length=-1;
return raw_length;
......@@ -2005,7 +2005,7 @@ namespace Common {
for(size_t i = 0; i < get_nof_comps(); i++){
CompField *cf=get_comp_byIndex(i);
int l=0;
l=cf->get_type()->get_raw_length();
l=cf->get_type()->get_type_refd_last()->get_raw_length();
if(l==-1){
raw_length=-1;
return raw_length;
......@@ -2527,7 +2527,7 @@ namespace Common {
allow_omit = true;
}
if(!hiba){
Error_Context cntx(this, "In Raw parmeter CROSSTAG");
Error_Context cntx(this, "In Raw parameter CROSSTAG");
Value *v = rawpar->crosstaglist.tag[c].keyList[a].v_value;
v->set_my_scope(get_my_scope());
v->set_my_governor(t2);
......
*.cc
*.hh
compile
Bug521125
Bug521125-rt2
*.log
*.d
\ No newline at end of file
/******************************************************************************
* Copyright (c) 2000-2017 Ericsson Telecom AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Szabo, Bence Janos
*
******************************************************************************/
module Bug521125 {
type component EmptyCT {
}
type AVP AVP_list;
type AVP_list AVP_Grouped;
type union Union {
AVP_Grouped select1,
integer i
}
type record AVP {
integer id,
Union selection
} with {
variant (selection) "CROSSTAG(
select1, id = 1;
i, id = 2
)"
}
testcase tc_Bug521125() runs on EmptyCT {
var AVP avp := {
id := 1,
selection := {
select1 := {
id := 2,
selection := {
i := 4
}
}
}
}
var bitstring bs := encvalue(avp);
var AVP result;
var integer i := decvalue(bs, result);
if (match(avp, result)) {
setverdict(pass);
} else {
setverdict(fail, match(avp, result));
}
}
control {
execute(tc_Bug521125())
}
} with { encode "RAW" }
##############################################################################
# Copyright (c) 2000-2017 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# Szabo, Bence Janos
#
##############################################################################
TOPDIR := ../..
include ../../Makefile.regression
# WARNING! This Makefile can be used with GNU make only.
# Other versions of make may report syntax errors in it.
#
# Do NOT touch this line...
#
.PHONY: all archive check clean dep objects
.SUFFIXES: .d
#
# Set these variables...
#
# Flags for dependency generation
CXXDEPFLAGS = -MM
ifeq ($(PLATFORM), WIN32)
# Silence linker warnings.
# Overridden by Makefile.cfg
endif
# Flags for the TTCN-3 and ASN.1 compiler:
COMPILER_FLAGS += -x
# Execution mode: (either ttcn3 or ttcn3-parallel)
TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
#
# You may change these variables. Add your files if necessary...
#
# TTCN-3 modules of this project:
TTCN3_MODULES = Bug521125.ttcn
# ASN.1 modules of this project:
ASN1_MODULES =
# C++ source & header files generated from the TTCN-3 & ASN.1 modules of
# this project:
GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc)
GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
ifdef SPLIT_TO_SLICES
POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
GENERATED_SOURCES += $(GENERATED_SOURCES2)
endif
# C/C++ Source & header files of Test Ports, external functions and
# other modules:
USER_SOURCES =
USER_HEADERS = $(USER_SOURCES:.cc=.hh)
# Object files of this project that are needed for the executable test suite:
OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
GENERATED_OBJECTS = $(GENERATED_SOURCES:.cc=.o)
USER_OBJECTS = $(USER_SOURCES:.cc=.o)
DEPFILES = $(USER_OBJECTS:.o=.d) $(GENERATED_OBJECTS:.o=.d)
# The name of the executable test suite:
TARGET = Bug521125$(RT2_SUFFIX)$(EXESUFFIX)
# Rules for building the executable...
#
all: $(TARGET) ;
objects: $(OBJECTS) ;
$(TARGET): $(OBJECTS)
if $(CXX) $(LDFLAGS) -o $@ $^ \
-L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
-L$(OPENSSL_DIR)/lib -lcrypto \
-L$(XMLDIR)/lib $($(PLATFORM)_LIBS); \
then : ; else $(TTCN3_DIR)/bin/titanver $(OBJECTS); exit 1; fi
.cc.o .c.o:
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
.cc.d .c.d:
@echo Creating dependency file for '$<'; set -e; \
$(CXX) $(CXXDEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< \
| sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
[ -s $@ ] || rm -f $@
$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
@if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
compile: $(TTCN3_MODULES) $(ASN1_MODULES)
$(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ - $?
touch $@
clean:
-$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
$(GENERATED_SOURCES) compile $(DEPFILES) \
tags *.log
distclean: clean
-$(RM) $(DEPFILES)
dep: $(GENERATED_SOURCES) $(USER_SOURCES) ;
ifeq ($(findstring n,$(MAKEFLAGS)),)
ifeq ($(filter clean distclean check compile archive diag,$(MAKECMDGOALS)),)
-include $(DEPFILES)
endif
endif
diag:
$(TTCN3_COMPILER) -v 2>&1
$(TTCN3_DIR)/bin/mctr_cli -v 2>&1
$(CXX) -v 2>&1
@echo TTCN3_DIR=$(TTCN3_DIR)
@echo OPENSSL_DIR=$(OPENSSL_DIR)
@echo XMLDIR=$(XMLDIR)
@echo PLATFORM=$(PLATFORM)
#
# Add your rules here if necessary...
#
run: $(TARGET) ./config.cfg
./$^
###############################################################################
# Copyright (c) 2000-2017 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# Szabo, Bence Janos
#
###############################################################################
[LOGGING]
LogFile := "Bug521125.log"
FileMask := LOG_ALL
ConsoleMask := TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
LogSourceInfo := Yes
[EXECUTE]
Bug521125.control
[TESTPORT_PARAMETERS]
......@@ -11,13 +11,14 @@
# Hanko, Matyas
# Kovacs, Ferenc
# Raduly, Csaba
# Szabo, Bence Janos
# Szabo, Janos Zoltan – initial implementation
#
##############################################################################
TOPDIR := ..
include $(TOPDIR)/Makefile.regression
RDIRS = Examples HN25015 HQ26535 HQ49956 HS16977 ustr Annex_E_variants
RDIRS = Examples HN25015 HQ26535 HQ49956 HS16977 ustr Annex_E_variants Bug521125
all dep clean run distclean:
for dir in $(RDIRS); do (cd $$dir && $(MAKE) $@) || exit; done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment