From c4315326d3dece36ce3de10f5b6865c5700cf5bb Mon Sep 17 00:00:00 2001 From: Saturneic Date: Fri, 3 Aug 2018 18:58:49 +0800 Subject: [PATCH] Fixed --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 464 +++++++++--------- id/id.c | 32 +- list/list.c | 19 +- stack/stack.c | 8 + tree/tree.c | 19 +- type/type.h | 1 + 6 files changed, 302 insertions(+), 241 deletions(-) diff --git a/ZE-Standard-Libraries.xcodeproj/xcuserdata/huyibing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ZE-Standard-Libraries.xcodeproj/xcuserdata/huyibing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 2c76f28..e74a180 100644 --- a/ZE-Standard-Libraries.xcodeproj/xcuserdata/huyibing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/ZE-Standard-Libraries.xcodeproj/xcuserdata/huyibing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -154,7 +154,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "test.c" - timestampString = "554985107.001519" + timestampString = "554986718.90595" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "64" @@ -170,7 +170,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "tree/tree_expand.c" - timestampString = "554638722.806551" + timestampString = "554986718.906049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "60" @@ -186,7 +186,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "id/id.c" - timestampString = "554985107.0016969" + timestampString = "554986718.906109" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "19" @@ -202,12 +202,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "id/id.c" - timestampString = "554985107.001803" + timestampString = "554986718.906213" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "81" - endingLineNumber = "81" - landmarkName = "s_idToASCIIString" + startingLineNumber = "99" + endingLineNumber = "99" + landmarkName = "simFitS_id" landmarkType = "9"> @@ -218,13 +218,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "id/id.c" - timestampString = "554985107.001882" + timestampString = "554986718.906307" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "84" - endingLineNumber = "84" - landmarkName = "s_idToASCIIString" - landmarkType = "9"> + startingLineNumber = "102" + endingLineNumber = "102" + landmarkName = "unknown" + landmarkType = "0"> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -381,27 +493,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "id/id.c" - timestampString = "554985107.002624" + timestampString = "554986718.9079241" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "218" - endingLineNumber = "218" - landmarkName = "freeS_id" - landmarkType = "9"> - - - - @@ -413,107 +509,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "id/id.c" - timestampString = "554985107.002749" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "20" - endingLineNumber = "20" - landmarkName = "initS_id" - landmarkType = "9"> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/id.c b/id/id.c index 22960d3..2c862da 100644 --- a/id/id.c +++ b/id/id.c @@ -17,14 +17,32 @@ unsigned long long getId(void) { SID *initS_id(unsigned int deep_level){ SID *p_sid = (SID *) malloc(sizeof(SID)); + if(p_sid == NULL){ + printf("\ninitS_id(): Error in getting the memory of sid.\n"); + } p_sid->type = VOID; p_sid->deep = deep_level; p_sid->value = NULL; p_sid->value_deeper = NULL; p_sid->value_deepest = NULL; - if (deep_level > 0) p_sid->value = (unsigned int *)malloc(sizeof(unsigned int)*DEEPC_LEN); - if (deep_level > 1) p_sid->value_deeper = (unsigned int *)malloc(sizeof(unsigned int)*DEEPB_LEN); - if (deep_level > 2) p_sid->value_deepest = (unsigned int *)malloc(sizeof(unsigned int)*DEEPA_LEN); + if (deep_level > 0) { + p_sid->value = (unsigned int *)malloc(sizeof(unsigned int)*DEEPC_LEN); + if(p_sid->value == NULL){ + printf("\ninitS_id(): Error in getting the memory of sid.value.\n"); + } + } + if (deep_level > 1){ + p_sid->value_deeper = (unsigned int *)malloc(sizeof(unsigned int)*DEEPB_LEN); + if(p_sid->value_deeper == NULL){ + printf("\ninitS_id(): Error in getting the memory of sid.value_deeper.\n"); + } + } + if (deep_level > 2){ + p_sid->value_deepest = (unsigned int *)malloc(sizeof(unsigned int)*DEEPA_LEN); + if(p_sid->value_deepest == NULL){ + printf("\ninitS_id(): Error in getting the memory of sid.value_deepest.\n"); + } + } return p_sid; } @@ -98,6 +116,9 @@ char *s_idToASCIIString(const SID *s_id){ deep_len = DEEPC_LEN + DEEPB_LEN + DEEPA_LEN + 1; deep_len *= DATA_BIT; } + if(string == NULL){ + printf("\ns_idToASCIIString(): Error in getting the memory of string.\n"); + } string[deep_len] = '\0'; temp = s_id->type; buff_count = DATA_BIT - 1; @@ -168,12 +189,13 @@ SID *asciiStringToS_id(const char *string){ else return NULL; unsigned int *buff = (unsigned int *) malloc(sizeof(unsigned int) * (string_len)); + if(buff == NULL){ + printf("\ns_idToASCIIString(): Error in getting the memory of string.\n"); + } for(int i = 0; i < string_len; i++){ buff[i] = (unsigned int)string[i] - 48; } - printf("%s\n",string); - s_id->type = 0; for (int i = 0; i < 5; i++){ s_id->type += buff[i] ; diff --git a/list/list.c b/list/list.c index ff7ba19..b4c3abd 100644 --- a/list/list.c +++ b/list/list.c @@ -8,8 +8,15 @@ int safeModeForNode(int ifon) { if (ifon == 1) { if (node_list == NULL && list_list == NULL) { node_list = (List *)malloc(sizeof(List)); + if(node_list == NULL){ + showError(pushError(LIST, HIGH, initInfo("safeModeForNode()", "Error in get the memory of node_list."))); + return -1; + } list_list = (List *)malloc(sizeof(List)); - + if(list_list == NULL){ + showError(pushError(LIST, HIGH, initInfo("safeModeForNode()", "Error in get the memory of list_list."))); + return -1; + } list_list->head = NULL; list_list->length = 0; list_list->tail = NULL; @@ -81,6 +88,10 @@ int releaseAllForNode(void) { Node *initNode(void) { Node *p_node = (Node *)malloc(sizeof(Node)); + if(p_node == NULL){ + showError(pushError(LIST_NODE, STANDARD, initInfo("initNode()", "Error in get the memory of node."))); + return NULL; + } Node *prec_node = NULL; p_node->s_id = getS_id(LIST_NODE, 2); p_node->if_sid = 1; @@ -99,8 +110,12 @@ Node *initNode(void) { } List *initList(void) { - Node *p_node; + Node *p_node = NULL; List *p_list = (List *)malloc(sizeof(List)); + if(p_list == NULL){ + showError(pushError(LIST_NODE, STANDARD, initInfo("initList()", "Error in get the memory of list."))); + return NULL; + } p_list->s_id = getS_id(LIST, 1); p_list->if_sid = 1; p_list->head = NULL; diff --git a/stack/stack.c b/stack/stack.c index 66580bd..acaee3f 100644 --- a/stack/stack.c +++ b/stack/stack.c @@ -2,6 +2,10 @@ Stack *initStack(void) { Stack *p_stack = (Stack *)malloc(sizeof(Stack)); + if(p_stack == NULL){ + showError(pushError(STACK, STANDARD, initInfo("initStack()", "Error in get the memory of stack."))); + return NULL; + } p_stack->s_id = getS_id(STACK, 1); p_stack->length = 0; p_stack->top = NULL; @@ -10,6 +14,10 @@ Stack *initStack(void) { SNode *initSNode(void) { SNode *p_snode = (SNode *)malloc(sizeof(SNode)); + if(p_snode == NULL){ + showError(pushError(STACK_NODE, STANDARD, initInfo("initSNode()", "Error in get the memory of snode."))); + return NULL; + } p_snode->s_id = getS_id(STACK_NODE, 2); p_snode->if_malloc = 0; p_snode->next = NULL; diff --git a/tree/tree.c b/tree/tree.c index bf5efd4..276304d 100644 --- a/tree/tree.c +++ b/tree/tree.c @@ -7,9 +7,16 @@ static int if_safeModeForTree = 0; int safeModeForTree(int ifon) { if (ifon == 1) { if (tnode_list == NULL && tree_list == NULL) { - tnode_list = (List *)malloc(sizeof(List)); + tnode_list = (List *)malloc(sizeof(List)); + if(tnode_list == NULL){ + showError(pushError(TREE_NODE, HIGH, initInfo("safeModeForTree()", "Error in get the memory of tnode_list."))); + return -1; + } tree_list = (List *)malloc(sizeof(List)); - + if(tree_list == NULL){ + showError(pushError(TREE_NODE, HIGH, initInfo("safeModeForTree()", "Error in get the memory of tree_list."))); + return -1; + } tree_list->head = NULL; tree_list->length = 0; tree_list->tail = NULL; @@ -31,6 +38,10 @@ int safeModeForTree(int ifon) { TNode *initTNode(void) { Node *s_node; TNode *p_tnode = (TNode *)malloc(sizeof(TNode)); + if(p_tnode == NULL){ + showError(pushError(TREE_NODE, STANDARD, initInfo("initTNode()", "Error in get the memory of tnode."))); + return NULL; + } p_tnode->s_id = getS_id(TREE_NODE, 2); p_tnode->if_sid = 1; p_tnode->child_num = 0; @@ -61,6 +72,10 @@ TNode *initTNode(void) { Tree *initTree(void) { Node *s_node; Tree *p_tree = (Tree *)malloc(sizeof(Tree)); + if(p_tree == NULL){ + showError(pushError(TREE, STANDARD, initInfo("initTree()", "Error in get the memory of tree."))); + return NULL; + } p_tree->s_id = getS_id(TREE, 1); p_tree->if_sid = 1; p_tree->root = NULL; diff --git a/type/type.h b/type/type.h index 4be9d31..47f5cca 100644 --- a/type/type.h +++ b/type/type.h @@ -17,6 +17,7 @@ #define LIST_NODE 8 #define TREE_NODE 9 #define STACK_NODE 10 +#define T_SID 11 #define DEEPC 1 #define DEEPB 2