[tarantool-patches] Re: [PATCH 1/2] sql: fix tuple format leak

[n.pettik]

> On 12 Apr 2018, at 14:58, Vladislav Shpilevoy <v.shpilevoy at tarantool.org> wrote:
> 
> Hello. Thank you for contributing! See below 3 comments.
> 
>> diff --git a/src/box/sql.c b/src/box/sql.c
>> index a6713f1f0..dd0cfcc1a 100644
>> --- a/src/box/sql.c
>> +++ b/src/box/sql.c
>> @@ -451,17 +451,13 @@ int tarantoolSqlite3EphemeralCreate(BtCursor *pCur, uint32_t field_count,
>>   *
>>   * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise.
>>   */
>> -int tarantoolSqlite3EphemeralInsert(BtCursor *pCur)
>> +int tarantoolSqlite3EphemeralInsert(struct space *space, char *tuple,
>> +				    char *tuple_end)
> 
> 1. Please, update the comment as well. And lets move it to a header, as it is done in tarantool core.

Fixed:

@@ -441,18 +441,8 @@ int tarantoolSqlite3EphemeralCreate(BtCursor *pCur, uint32_t field_count,
        return tarantoolSqlite3First(pCur, &unused);
 }
 
-/*
- * Insert tuple which is contained in pX into ephemeral space. In contrast to
- * ordinary spaces, there is no need to create and fill request or handle
- * transaction routine.
- *
- * @param pCur Cursor pointing to ephemeral space.
- * @param pX Payload containing tuple to insert.
- *
- * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise.
- */
+int tarantoolSqlite3EphemeralInsert(struct space *space, const char *tuple,
+                                   const char *tuple_end)

@@ -98,8 +100,19 @@ int tarantoolSqlite3RenameParentTable(int iTab, const char *zOldParentName,
 /* Interface for ephemeral tables. */
 int tarantoolSqlite3EphemeralCreate(BtCursor * pCur, uint32_t filed_count,
                                    struct coll *aColl);
-int tarantoolSqlite3EphemeralInsert(struct space *space, char *tuple,
-                                   char *tuple_end);
+/**
+ * Insert tuple into ephemeral space.
+ * In contrast to ordinary spaces, there is no need to create and
+ * fill request or handle transaction routine.
+ *
+ * @param space Ephemeral space.
+ * @param tuple Tuple to be inserted.
+ * @param tuple_end End of tuple to be inserted.
+ *
+ * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise.
+ */
+int tarantoolSqlite3EphemeralInsert(struct space *space, const char *tuple,
+                                   const char *tuple_end);

> 
>>  {
>> -	assert(pCur);
>> -	assert(pCur->curFlags & BTCF_TEphemCursor);
>> -	mp_tuple_assert(pCur->key, pCur->key + pCur->nKey);
>> -
>> -	if (space_ephemeral_replace(pCur->space, pCur->key,
>> -				    pCur->key + pCur->nKey) != 0) {
>> -		diag_log();
>> +	assert(space != NULL);
>> +	mp_tuple_assert(tuple, tuple_end);
>> +	if (space_ephemeral_replace(space, tuple, tuple_end) != 0)
>>  		return SQL_TARANTOOL_INSERT_FAIL;
>> -	}
>>  	return SQLITE_OK;
>>  }
>>  @@ -475,28 +471,29 @@ int tarantoolSqlite3EphemeralDrop(BtCursor *pCur)
>>  }
>>    static inline int
>> -insertOrReplace(BtCursor *pCur, enum iproto_type type)
>> +insertOrReplace(struct space *space, char *tuple, char *tuple_end,
>> +		enum iproto_type type)
> 
> 2. Please, make a pointer be const, if it is not changed. Here it is const. Const specifier helps compiler to do more accurate optimization.

Fixed:

@@ -471,7 +461,7 @@ int tarantoolSqlite3EphemeralDrop(BtCursor *pCur)
 }
 
 static inline int
-insertOrReplace(struct space *space, char *tuple, char *tuple_end,
+insertOrReplace(struct space *space, const char *tuple, const char *tuple_end,

> 
>> -int tarantoolSqlite3Insert(BtCursor *pCur)
>> +int tarantoolSqlite3Insert(struct space *space, char *tuple, char *tuple_end)
>>  {
>> -	return insertOrReplace(pCur, IPROTO_INSERT);
>> +	return insertOrReplace(space, tuple, tuple_end, IPROTO_INSERT);
>>  }
>>  -int tarantoolSqlite3Replace(BtCursor *pCur)
>> +int tarantoolSqlite3Replace(struct space *space, char *tuple, char *tuple_end)
> 
> 3. Same.

-int tarantoolSqlite3Replace(struct space *space, char *tuple, char *tuple_end)
+int tarantoolSqlite3Replace(struct space *space, const char *tuple,
+                           const char *tuple_end)

-int tarantoolSqlite3Insert(struct space *space, char *tuple, char *tuple_end)
+int tarantoolSqlite3Insert(struct space *space, const char *tuple,
+                          const char *tuple_end)

src/box/sql/tarantoolInt.h:

-int tarantoolSqlite3Insert(struct space *space, char *tuple, char *tuple_end);
-int tarantoolSqlite3Replace((struct space *space, char *tuple, char *tuple_end);
+int tarantoolSqlite3Insert(struct space *space, const char *tuple,
+			   const char *tuple_end);
+int tarantoolSqlite3Replace(struct space *space, const char *tuple,
+			    const char *tuple_end);