merged in default ENGINE-332
authorKrista Bennett <krista@pep-project.org>
Wed, 24 Jan 2018 10:56:08 +0100
branchENGINE-332
changeset 2439dcb337e68add
parent 2438 9e20316df746
parent 2437 97d602cc813b
child 2441 eef4dbecb648
merged in default
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Jan 24 10:54:04 2018 +0100
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Jan 24 10:56:08 2018 +0100
     1.3 @@ -7,6 +7,8 @@
     1.4  	objects = {
     1.5  
     1.6  /* Begin PBXBuildFile section */
     1.7 +		430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; };
     1.8 +		430BCC492015EE800077E998 /* pEp_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 430BCC472015EE800077E998 /* pEp_string.c */; };
     1.9  		430D258B1C9ED75A00B94535 /* blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 430D258A1C9ED75A00B94535 /* blacklist.c */; };
    1.10  		4354FF651D6EDF300033069C /* sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF641D6EDF300033069C /* sync_impl.c */; };
    1.11  		4354FF691D6EE1A70033069C /* NULL.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF681D6EE1A70033069C /* NULL.c */; };
    1.12 @@ -189,6 +191,8 @@
    1.13  /* End PBXCopyFilesBuildPhase section */
    1.14  
    1.15  /* Begin PBXFileReference section */
    1.16 +		430BCC462015EE800077E998 /* pEp_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEp_string.h; path = ../src/pEp_string.h; sourceTree = "<group>"; };
    1.17 +		430BCC472015EE800077E998 /* pEp_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pEp_string.c; path = ../src/pEp_string.c; sourceTree = "<group>"; };
    1.18  		430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
    1.19  		4346F86A1ECB38E700381CBE /* sync_app.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sync_app.h; path = ../src/sync_app.h; sourceTree = "<group>"; };
    1.20  		4354FF641D6EDF300033069C /* sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_impl.c; path = ../src/sync_impl.c; sourceTree = "<group>"; };
    1.21 @@ -508,6 +512,8 @@
    1.22  		64A8264B1B455C5600EECAF0 /* srcref */ = {
    1.23  			isa = PBXGroup;
    1.24  			children = (
    1.25 +				430BCC472015EE800077E998 /* pEp_string.c */,
    1.26 +				430BCC462015EE800077E998 /* pEp_string.h */,
    1.27  				43F6921C1F164A47009418F5 /* resource_id.c */,
    1.28  				43BA0F451D7964750059172F /* asn1_helper.c */,
    1.29  				4354FF641D6EDF300033069C /* sync_impl.c */,
    1.30 @@ -617,6 +623,7 @@
    1.31  				646C41481D510D2C00C63EFF /* sync_fsm.h in Headers */,
    1.32  				64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */,
    1.33  				646C41091D510CD800C63EFF /* constr_TYPE.h in Headers */,
    1.34 +				430BCC482015EE800077E998 /* pEp_string.h in Headers */,
    1.35  				646C410D1D510CD800C63EFF /* der_encoder.h in Headers */,
    1.36  				646C41231D510CD800C63EFF /* NativeEnumerated.h in Headers */,
    1.37  				646C41071D510CD800C63EFF /* constr_SET_OF.h in Headers */,
    1.38 @@ -852,6 +859,7 @@
    1.39  				646C412A1D510CD800C63EFF /* per_encoder.c in Sources */,
    1.40  				646C412E1D510CD800C63EFF /* per_support.c in Sources */,
    1.41  				64A826781B455D0800EECAF0 /* bloblist.c in Sources */,
    1.42 +				430BCC492015EE800077E998 /* pEp_string.c in Sources */,
    1.43  				646C41041D510CD800C63EFF /* constr_SEQUENCE.c in Sources */,
    1.44  				64A826881B455D0800EECAF0 /* timestamp.c in Sources */,
    1.45  				646C41221D510CD800C63EFF /* NativeEnumerated.c in Sources */,
     2.1 --- a/src/pEp_string.c	Wed Jan 24 10:54:04 2018 +0100
     2.2 +++ b/src/pEp_string.c	Wed Jan 24 10:56:08 2018 +0100
     2.3 @@ -21,7 +21,7 @@
     2.4          assert(s);
     2.5      }
     2.6      else {
     2.7 -        s = calloc(1, len);
     2.8 +        s = calloc(1, len + 1);
     2.9          assert(s);
    2.10      }
    2.11  
     3.1 --- a/src/platform_windows.h	Wed Jan 24 10:54:04 2018 +0100
     3.2 +++ b/src/platform_windows.h	Wed Jan 24 10:56:08 2018 +0100
     3.3 @@ -86,7 +86,7 @@
     3.4  int uuid_parse(char *in, pEpUUID uu);
     3.5  void uuid_unparse_upper(pEpUUID uu, uuid_string_t out);
     3.6  
     3.7 -#ifndef inline
     3.8 +#ifndef __cplusplus
     3.9  #define inline __inline
    3.10  #endif
    3.11