Make sure string data is available when passed to the registered completion handler (#6411)

vivien-apple · pull[bot] · commit 1015364535a6 · 2021-08-30T14:43:07.000Z
* Make sure string data are available when passed to the registered completion handler

* Update gen/ folders
diff --git a/examples/chip-tool/gen/CHIPClustersObjc.mm b/examples/chip-tool/gen/CHIPClustersObjc.mm
@@ -104,16 +104,15 @@ static void CallbackFn(void * context, uint8_t status)
 
     static void CallbackFn(void * context, chip::ByteSpan value)
     {
+        NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
+
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
                 if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
                     callback->mHandler(nil, @ { @"value" : data });
                 } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
+                    NSString * str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
                     callback->mHandler(nil, @ { @"value" : str });
                 }
 
diff --git a/src/app/zap-templates/templates/app/CHIPClustersObjc-src.zapt b/src/app/zap-templates/templates/app/CHIPClustersObjc-src.zapt
@@ -88,17 +88,18 @@ public:
 
     static void CallbackFn(void * context, chip::ByteSpan value)
     {
+        NSData * data = [NSData dataWithBytes: value.data() length: value.size()];
+
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
                 if (callback->mOctetString)
                 {
-                    NSData *data = [NSData dataWithBytes: value.data() length: value.size()];
                     callback->mHandler(nil, @{ @"value": data });
                 }
                 else
                 {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];
+                    NSString * str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
                     callback->mHandler(nil, @{ @"value": str });
                 }
 
diff --git a/src/controller/python/gen/CHIPClustersObjc.mm b/src/controller/python/gen/CHIPClustersObjc.mm
@@ -104,16 +104,15 @@ static void CallbackFn(void * context, uint8_t status)
 
     static void CallbackFn(void * context, chip::ByteSpan value)
     {
+        NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
+
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
                 if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
                     callback->mHandler(nil, @ { @"value" : data });
                 } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
+                    NSString * str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
                     callback->mHandler(nil, @ { @"value" : str });
                 }
 
diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm
@@ -104,16 +104,15 @@ static void CallbackFn(void * context, uint8_t status)
 
     static void CallbackFn(void * context, chip::ByteSpan value)
     {
+        NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
+
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
                 if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
                     callback->mHandler(nil, @ { @"value" : data });
                 } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
+                    NSString * str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
                     callback->mHandler(nil, @ { @"value" : str });
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -88,17 +88,18 @@ public:`
`88`	`88`
`89`	`89`	`static void CallbackFn(void * context, chip::ByteSpan value)`
`90`	`90`	`{`
	`91`	`+ NSData * data = [NSData dataWithBytes: value.data() length: value.size()];`
	`92`	`+`
`91`	`93`	`CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);`
`92`	`94`	`if (callback && callback->mQueue) {`
`93`	`95`	`dispatch_async(callback->mQueue, ^{`
`94`	`96`	`if (callback->mOctetString)`
`95`	`97`	`{`
`96`		`- NSData *data = [NSData dataWithBytes: value.data() length: value.size()];`
`97`	`98`	`callback->mHandler(nil, @{ @"value": data });`
`98`	`99`	`}`
`99`	`100`	`else`
`100`	`101`	`{`
`101`		`- NSString * str = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];`
	`102`	`+ NSString * str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];`
`102`	`103`	`callback->mHandler(nil, @{ @"value": str });`
`103`	`104`	`}`
`104`	`105`